Browse Source

增加.NET Framework4.5可用的版本包

懒得勤快 4 years ago
parent
commit
1402940e80

+ 2 - 2
Masuit.Tools.Abstractions/Config/CoreConfig.cs

@@ -1,7 +1,7 @@
 #if NET461
 using System.Configuration;
 
-namespace Masuit.Tools.Core.Config
+namespace Masuit.Tools.Config
 {
     public static class ConfigHelper
     {
@@ -17,7 +17,7 @@ namespace Masuit.Tools.Core.Config
 using Microsoft.Extensions.Configuration;
 using System;
 
-namespace Masuit.Tools.Core.Config
+namespace Masuit.Tools.Config
 {
     /// <summary>
     /// .net core的配置导入

+ 2 - 2
Masuit.Tools.Abstractions/DateTimeExt/DateTimeHelper.cs

@@ -139,14 +139,14 @@ namespace Masuit.Tools.DateTimeExt
         /// </summary>
         /// <param name="dt"></param>
         /// <returns></returns>
-        public static double GetTotalSeconds(this in DateTime dt) => new DateTimeOffset(dt).ToUnixTimeSeconds();
+        public static double GetTotalSeconds(this in DateTime dt) => new DateTimeOffset(dt).UtcDateTime.Ticks / 10000L - 62135596800000L;
 
         /// <summary>
         /// 获取该时间相对于1970-01-01T00:00:00Z的毫秒数
         /// </summary>
         /// <param name="dt"></param>
         /// <returns></returns>
-        public static double GetTotalMilliseconds(this in DateTime dt) => new DateTimeOffset(dt).ToUnixTimeMilliseconds();
+        public static double GetTotalMilliseconds(this in DateTime dt) => new DateTimeOffset(dt).UtcDateTime.Ticks / 10000L - 62135596800000L;
 
         /// <summary>
         /// 获取该时间相对于1970-01-01T00:00:00Z的微秒时间戳

+ 2 - 2
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
     <Version>2.4.3.3</Version>
@@ -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.1" />
+        <PackageReference Include="SharpCompress" Version="0.28.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

+ 1 - 1
Masuit.Tools.Abstractions/Reflection/ReflectionUtil.cs

@@ -444,7 +444,7 @@ namespace Masuit.Tools.Reflection
                 };
 
                 Type[] constructorArgumentTypes = argumentTypes.Where(t => t != typeof(TypeToIgnore)).ToArray();
-                var constructor = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, CallingConventions.HasThis, constructorArgumentTypes, Array.Empty<ParameterModifier>());
+                var constructor = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, CallingConventions.HasThis, constructorArgumentTypes, new ParameterModifier[0]);
 
                 var lamdaParameterExpressions = new[]
                 {

+ 1 - 1
Masuit.Tools.Abstractions/Validator/IsEmailAttribute.cs

@@ -1,4 +1,4 @@
-using Masuit.Tools.Core.Config;
+using Masuit.Tools.Config;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.RegularExpressions;

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

@@ -14,7 +14,7 @@
         <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
         <Product>Masuit.Tools.Core</Product>
         <PackageId>Masuit.Tools.Core</PackageId>
-        <LangVersion>preview</LangVersion>
+        <LangVersion>latest</LangVersion>
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -43,7 +43,7 @@
         <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.1" />
+        <PackageReference Include="SharpCompress" Version="0.28.2" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

+ 1 - 1
Masuit.Tools.Core/Net/WebExtension.cs

@@ -1,4 +1,4 @@
-using Masuit.Tools.Core.Config;
+using Masuit.Tools.Config;
 using Masuit.Tools.Models;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;

+ 1 - 1
Masuit.Tools.Excel/Masuit.Tools.Excel.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5</TargetFrameworks>
-        <LangVersion>9.0</LangVersion>
+        <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <CodeAnalysisRuleSet />
         <Version>1.0.0</Version>

+ 12 - 0
Masuit.Tools.Net45/Config/CoreConfig.cs

@@ -0,0 +1,12 @@
+using System.Configuration;
+
+namespace Masuit.Tools.Config
+{
+    public static class ConfigHelper
+    {
+        public static string GetConfigOrDefault(string key, string defaultValue = "")
+        {
+            return ConfigurationManager.AppSettings.Get(key) ?? defaultValue;
+        }
+    }
+}

+ 342 - 0
Masuit.Tools.Net45/Masuit.Tools.Net45.csproj

@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" 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>{F51077A5-1CCA-4576-89BB-5447AC3D8DBC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Masuit.Tools.Net45</RootNamespace>
+    <AssemblyName>Masuit.Tools.Net45</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </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>
+    <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>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Masuit.Tools.Abstractions\Database\DataTableBuilder.cs">
+      <Link>Database\DataTableBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Database\DataTableHelper.cs">
+      <Link>Database\DataTableHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\DateTimeExt\ChineseCalendar.cs">
+      <Link>DateTimeExt\ChineseCalendar.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\DateTimeExt\DateInfoStruct.cs">
+      <Link>DateTimeExt\DateInfoStruct.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\DateTimeExt\DateTimeHelper.cs">
+      <Link>DateTimeExt\DateTimeHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\DateTimeExt\WeekHolidayStruct.cs">
+      <Link>DateTimeExt\WeekHolidayStruct.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\BigIntegerExtensions.cs">
+      <Link>Extensions\BaseType\BigIntegerExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\DoubleExtensions.cs">
+      <Link>Extensions\BaseType\DoubleExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\IConvertibleExtensions.cs">
+      <Link>Extensions\BaseType\IConvertibleExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\IDictionaryExtensions.cs">
+      <Link>Extensions\BaseType\IDictionaryExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\IEnumerableExtensions.cs">
+      <Link>Extensions\BaseType\IEnumerableExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\IntExtensions.cs">
+      <Link>Extensions\BaseType\IntExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\IPAddressExtensions.cs">
+      <Link>Extensions\BaseType\IPAddressExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\LongExtensions.cs">
+      <Link>Extensions\BaseType\LongExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\ObjectExtensions.cs">
+      <Link>Extensions\BaseType\ObjectExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\RandomExtensions.cs">
+      <Link>Extensions\BaseType\RandomExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\ShortExtensions.cs">
+      <Link>Extensions\BaseType\ShortExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\StreamExtensions.cs">
+      <Link>Extensions\BaseType\StreamExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\StringExtensions.cs">
+      <Link>Extensions\BaseType\StringExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Extensions\BaseType\ValueTypeConvertExtensions.cs">
+      <Link>Extensions\BaseType\ValueTypeConvertExtensions.cs</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\Linq\LinqExtension.cs">
+      <Link>Linq\LinqExtension.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Logging\LogInfo.cs">
+      <Link>Logging\LogInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Logging\LogLevel.cs">
+      <Link>Logging\LogLevel.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Logging\LogManager.cs">
+      <Link>Logging\LogManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Maths\Point2D.cs">
+      <Link>Maths\Point2D.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Maths\RadarChart.cs">
+      <Link>Maths\RadarChart.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Maths\RadarChartEngine.cs">
+      <Link>Maths\RadarChartEngine.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Maths\Vector2D.cs">
+      <Link>Maths\Vector2D.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Media\ImageUtilities.cs">
+      <Link>Media\ImageUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Media\ImageWatermarker.cs">
+      <Link>Media\ImageWatermarker.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Media\ThumbnailCutMode.cs">
+      <Link>Media\ThumbnailCutMode.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Media\WatermarkPosition.cs">
+      <Link>Media\WatermarkPosition.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Mime\ContentType.cs">
+      <Link>Mime\ContentType.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Mime\DefaultMimeItems.cs">
+      <Link>Mime\DefaultMimeItems.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Mime\IMimeMapper.cs">
+      <Link>Mime\IMimeMapper.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Mime\MimeMapper.cs">
+      <Link>Mime\MimeMapper.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Mime\MimeMappingItem.cs">
+      <Link>Mime\MimeMappingItem.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\AddressComponent.cs">
+      <Link>Models\AddressComponent.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\AddressResult.cs">
+      <Link>Models\AddressResult.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\BaiduIP.cs">
+      <Link>Models\BaiduIP.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\DateTimeRange.cs">
+      <Link>Models\DateTimeRange.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\Email.cs">
+      <Link>Models\Email.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\EmailAddress.cs">
+      <Link>Models\EmailAddress.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\IspInfo.cs">
+      <Link>Models\IspInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\ITree.cs">
+      <Link>Models\ITree.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\Location.cs">
+      <Link>Models\Location.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\PagedList.cs">
+      <Link>Models\PagedList.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\PhysicsAddress.cs">
+      <Link>Models\PhysicsAddress.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\Pois.cs">
+      <Link>Models\Pois.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\TaobaoIP.cs">
+      <Link>Models\TaobaoIP.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\Tree.cs">
+      <Link>Models\Tree.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Models\TreeExtensions.cs">
+      <Link>Models\TreeExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Net\FtpClient.cs">
+      <Link>Net\FtpClient.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Net\MultiThreadDownloader.cs">
+      <Link>Net\MultiThreadDownloader.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Net\PartialDownloader.cs">
+      <Link>Net\PartialDownloader.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Net\SocketClient.cs">
+      <Link>Net\SocketClient.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\Extensions.cs">
+      <Link>RandomSelector\Extensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\MultipleSelector.cs">
+      <Link>RandomSelector\MultipleSelector.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\SelectorBase.cs">
+      <Link>RandomSelector\SelectorBase.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\SelectorOptions.cs">
+      <Link>RandomSelector\SelectorOptions.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\SingleSelector.cs">
+      <Link>RandomSelector\SingleSelector.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\WeightedItem.cs">
+      <Link>RandomSelector\WeightedItem.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\RandomSelector\WeightedSelector.cs">
+      <Link>RandomSelector\WeightedSelector.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Reflection\ReflectionUtil.cs">
+      <Link>Reflection\ReflectionUtil.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\Crc32.cs">
+      <Link>Security\Crc32.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\Crc64.cs">
+      <Link>Security\Crc64.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\Encrypt.cs">
+      <Link>Security\Encrypt.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\HashEncode.cs">
+      <Link>Security\HashEncode.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\RSA.cs">
+      <Link>Security\RSA.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\RSACrypt.cs">
+      <Link>Security\RSACrypt.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\RsaKey.cs">
+      <Link>Security\RsaKey.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\RsaKeyType.cs">
+      <Link>Security\RsaKeyType.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Security\RsaPem.cs">
+      <Link>Security\RsaPem.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\ConcurrentLimitedQueue.cs">
+      <Link>Systems\ConcurrentLimitedQueue.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\Disposable.cs">
+      <Link>Systems\Disposable.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\EnumExt.cs">
+      <Link>Systems\EnumExt.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\HiPerfTimer.cs">
+      <Link>Systems\HiPerfTimer.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\LimitedQueue.cs">
+      <Link>Systems\LimitedQueue.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\SnowFlake.cs">
+      <Link>Systems\SnowFlake.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Systems\StopwatchHelper.cs">
+      <Link>Systems\StopwatchHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\ComplexPassword.cs">
+      <Link>Validator\ComplexPassword.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\IsEmailAttribute.cs">
+      <Link>Validator\IsEmailAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\IsIPAddressAttribute.cs">
+      <Link>Validator\IsIPAddressAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\IsPhoneAttribute.cs">
+      <Link>Validator\IsPhoneAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\MaxValueAttribute.cs">
+      <Link>Validator\MaxValueAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Validator\MinValueAttribute.cs">
+      <Link>Validator\MinValueAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\Masuit.Tools.Abstractions\Win32\WindowsCommand.cs">
+      <Link>Win32\WindowsCommand.cs</Link>
+    </Compile>
+    <Compile Include="Config\CoreConfig.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DnsClient">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.5.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="package.nuspec" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

BIN
Masuit.Tools.Net45/Properties/AssemblyInfo.cs


+ 27 - 0
Masuit.Tools.Net45/package.nuspec

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <!--*-->
+    <id>Masuit.Tools.Net45</id>
+    <!--*-->
+    <version>2.4.3.3</version>
+    <title>Masuit.Tools</title>
+    <!--*-->
+    <authors>masuit.com</authors>
+    <owners>ldqk.org</owners>
+    <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>包含一些常用的操作类,大都是静态类,加密解密,反射操作,硬件信息,字符串扩展方法,日期时间扩展操作,大文件拷贝,图像裁剪,html处理,验证码、NoSql等常用封装。
+      
+官网教程:https://ldqk.org/55
+      
+github:https://github.com/ldqk/Masuit.Tools</description>
+    <!--*-->
+    <releaseNotes>如有问题请联系作者QQ:3444764617,或者到项目的github反馈问题,详细的API文档在github上:https://github.com/ldqk/Masuit.Tools</releaseNotes>
+    <copyright>Copyright ©  懒得勤快</copyright>
+    <tags>Masuit.Tools,工具库,Utility,Crypt,Extensions</tags>
+  </metadata>
+</package>

+ 1 - 1
Masuit.Tools.NoSQL.MongoDBClient/Masuit.Tools.NoSQL.MongoDBClient.csproj

@@ -18,7 +18,7 @@
     <Product>Masuit.Tools.NoSQL.MongoDBClient</Product>
     <PackageId>Masuit.Tools.NoSQL.MongoDBClient</PackageId>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

+ 7 - 1
Masuit.Tools.sln

@@ -23,7 +23,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.AspNetCore.Res
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.Test", "Test\Masuit.Tools.Test\Masuit.Tools.Test.csproj", "{AB9F4635-0ACB-4E5E-8E1B-431E0818CF60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.Excel", "Masuit.Tools.Excel\Masuit.Tools.Excel.csproj", "{47DF4A43-9C19-4572-B025-876A7710C1CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Excel", "Masuit.Tools.Excel\Masuit.Tools.Excel.csproj", "{47DF4A43-9C19-4572-B025-876A7710C1CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.Net45", "Masuit.Tools.Net45\Masuit.Tools.Net45.csproj", "{F51077A5-1CCA-4576-89BB-5447AC3D8DBC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,6 +73,10 @@ Global
 		{47DF4A43-9C19-4572-B025-876A7710C1CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47DF4A43-9C19-4572-B025-876A7710C1CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47DF4A43-9C19-4572-B025-876A7710C1CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F51077A5-1CCA-4576-89BB-5447AC3D8DBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F51077A5-1CCA-4576-89BB-5447AC3D8DBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F51077A5-1CCA-4576-89BB-5447AC3D8DBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F51077A5-1CCA-4576-89BB-5447AC3D8DBC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 1 - 1
Masuit.Tools/Config/CoreConfig.cs

@@ -1,6 +1,6 @@
 using System.Configuration;
 
-namespace Masuit.Tools.Core.Config
+namespace Masuit.Tools.Config
 {
     public static class ConfigHelper
     {

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

@@ -27,7 +27,7 @@
     <DocumentationFile>bin\Debug\Masuit.Tools.XML</DocumentationFile>
     <NoWarn>1591</NoWarn>
     <CodeAnalysisRuleSet />
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,7 +40,7 @@
     <DocumentationFile>bin\Release\Masuit.Tools.XML</DocumentationFile>
     <NoWarn>1591</NoWarn>
     <CodeAnalysisRuleSet />
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -412,7 +412,7 @@
       <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="SharpCompress">
-      <Version>0.28.1</Version>
+      <Version>0.28.2</Version>
     </PackageReference>
     <PackageReference Include="StackExchange.Redis">
       <Version>2.2.4</Version>

+ 1 - 1
Masuit.Tools/Net/WebExtension.cs

@@ -1,4 +1,4 @@
-using Masuit.Tools.Core.Config;
+using Masuit.Tools.Config;
 using Masuit.Tools.Logging;
 using Masuit.Tools.Models;
 using Masuit.Tools.NoSQL;

+ 1 - 1
NetCoreTest/NetCoreTest.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
     <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">