升级包

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

@@ -49,7 +49,7 @@
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
     <PackageReference Include="System.Management" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-        <PackageReference Include="SharpCompress" Version="0.28.2" />
+        <PackageReference Include="SharpCompress" Version="0.28.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

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

@@ -43,7 +43,7 @@ github：https://github.com/ldqk/Masuit.Tools
         <PackageReference Include="System.Management" Version="4.7.0" />
         <PackageReference Include="System.Management" Version="5.0" />
         <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-        <PackageReference Include="SharpCompress" Version="0.28.2" />
+        <PackageReference Include="SharpCompress" Version="0.28.3" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
@@ -57,7 +57,7 @@ github：https://github.com/ldqk/Masuit.Tools
         <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net5'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
         <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="5.0.1" />
         <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
     </ItemGroup>

Masuit.Tools.NoSQL.MongoDBClient/Masuit.Tools.NoSQL.MongoDBClient.csproj

@@ -38,9 +38,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" Version="2.12.3" />
-    <PackageReference Include="MongoDB.Driver" Version="2.12.3" />
-    <PackageReference Include="MongoDB.Driver.Core" Version="2.12.3" />
+    <PackageReference Include="MongoDB.Bson" Version="2.12.4" />
+    <PackageReference Include="MongoDB.Driver" Version="2.12.4" />
+    <PackageReference Include="MongoDB.Driver.Core" Version="2.12.4" />
   </ItemGroup>
 
 </Project>

Masuit.Tools/Masuit.Tools.csproj

@@ -1,184 +1,182 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{275D5A0D-C49C-497E-A4B5-F40285C2495F}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>Masuit.Tools</RootNamespace>
-        <AssemblyName>Masuit.Tools</AssemblyName>
-        <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
-        <NuGetPackageImportStamp>
-        </NuGetPackageImportStamp>
-        <TargetFrameworkProfile />
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <DocumentationFile>bin\Debug\Masuit.Tools.XML</DocumentationFile>
-        <NoWarn>1591</NoWarn>
-        <CodeAnalysisRuleSet />
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <DocumentationFile>bin\Release\Masuit.Tools.XML</DocumentationFile>
-        <NoWarn>1591</NoWarn>
-        <CodeAnalysisRuleSet />
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-    <PropertyGroup>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Masuit.Tools.Abstractions\Database\*.*">
-            <Link>Database\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\DateTimeExt\*.*">
-            <Link>DateTimeExt\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Extensions\*\*.*">
-            <Link>Extensions\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Files\FileExt.cs">
-            <Link>Files\FileExt.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Files\INIFile.cs">
-            <Link>Files\INIFile.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Hardware\*.*">
-            <Link>Hardware\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Logging\*.*">
-            <Link>Logging\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Maths\*.*">
-            <Link>Maths\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Media\*.*">
-            <Link>Media\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Mime\*.*">
-            <Link>Mime\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Models\*.*">
-            <Link>Models\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Html\HtmlTools.cs">
-            <Link>Html\HtmlTools.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Linq\LinqExtension.cs">
-            <Link>Linq\LinqExtension.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Net\*.*">
-            <Link>Net\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\*.*">
-            <Link>RandomSelector\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Security\*.*">
-            <Link>Security\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Reflection\ReflectionUtil.cs">
-            <Link>Reflection\ReflectionUtil.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Strings\NumberFormater.cs">
-            <Link>Strings\NumberFormater.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Strings\Template.cs">
-            <Link>Strings\Template.cs</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Systems\*.*">
-            <Link>Systems\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Validator\*.*">
-            <Link>Validator\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="..\Masuit.Tools.Abstractions\Win32\*.*">
-            <Link>Win32\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        <Compile Include="Config\CoreConfig.cs" />
-        <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="Strings\ValidateCode.cs" />
-        <Compile Include="Systems\Lock.cs" />
-        <Compile Include="Systems\RedisLock.cs" />
-    </ItemGroup>
-    <ItemGroup>
-        <None Include="app.config" />
-        <None Include="package.nuspec" />
-    </ItemGroup>
-    <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.ComponentModel.DataAnnotations" />
-        <Reference Include="System.Configuration" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Drawing" />
-        <Reference Include="System.Management" />
-        <Reference Include="System.Net" />
-        <Reference Include="System.Net.Http" />
-        <Reference Include="System.Numerics" />
-        <Reference Include="System.Web" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="DnsClient">
-            <Version>1.4.0</Version>
-        </PackageReference>
-        <PackageReference Include="HtmlSanitizer">
-            <Version>5.0.404</Version>
-        </PackageReference>
-        <PackageReference Include="Microsoft.AspNet.Mvc">
-            <Version>5.2.7</Version>
-        </PackageReference>
-        <PackageReference Include="Newtonsoft.Json">
-            <Version>13.0.1</Version>
-        </PackageReference>
-        <PackageReference Include="SharpCompress">
-            <Version>0.28.2</Version>
-        </PackageReference>
-        <PackageReference Include="StackExchange.Redis">
-            <Version>2.2.4</Version>
-        </PackageReference>
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{275D5A0D-C49C-497E-A4B5-F40285C2495F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Masuit.Tools</RootNamespace>
+    <AssemblyName>Masuit.Tools</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Debug\Masuit.Tools.XML</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+    <CodeAnalysisRuleSet />
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Release\Masuit.Tools.XML</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+    <CodeAnalysisRuleSet />
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Masuit.Tools.Abstractions\Database\*.*">
+      <Link>Database\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\DateTimeExt\*.*">
+      <Link>DateTimeExt\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\*\*.*">
+      <Link>Extensions\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Files\FileExt.cs">
+      <Link>Files\FileExt.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Files\INIFile.cs">
+      <Link>Files\INIFile.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Hardware\*.*">
+      <Link>Hardware\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Logging\*.*">
+      <Link>Logging\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Maths\*.*">
+      <Link>Maths\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Media\*.*">
+      <Link>Media\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Mime\*.*">
+      <Link>Mime\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\*.*">
+      <Link>Models\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Html\HtmlTools.cs">
+      <Link>Html\HtmlTools.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Linq\LinqExtension.cs">
+      <Link>Linq\LinqExtension.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Net\*.*">
+      <Link>Net\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\*.*">
+      <Link>RandomSelector\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\*.*">
+      <Link>Security\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Reflection\ReflectionUtil.cs">
+      <Link>Reflection\ReflectionUtil.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Strings\NumberFormater.cs">
+      <Link>Strings\NumberFormater.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Strings\Template.cs">
+      <Link>Strings\Template.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\*.*">
+      <Link>Systems\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\*.*">
+      <Link>Validator\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Win32\*.*">
+      <Link>Win32\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="Config\CoreConfig.cs" />
+    <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="Strings\ValidateCode.cs" />
+    <Compile Include="Systems\Lock.cs" />
+    <Compile Include="Systems\RedisLock.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="package.nuspec" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DnsClient">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="HtmlSanitizer">
+      <Version>5.0.404</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNet.Mvc">
+      <Version>5.2.7</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SharpCompress">
+      <Version>0.28.3</Version>
+    </PackageReference>
+    <PackageReference Include="StackExchange.Redis">
+      <Version>2.2.4</Version>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>

NetCoreTest/Program.cs

@@ -62,7 +62,6 @@ namespace NetCoreTest
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>();
-
     }
 
     public class MyClass : ITree<MyClass>

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

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="xunit" Version="2.4.1" />