Browse Source

升级包

懒得勤快 4 years ago
parent
commit
cba996ff4f

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

@@ -46,7 +46,7 @@
   <ItemGroup>
     <PackageReference Include="DnsClient" Version="1.3.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.29" />
-    <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
+    <PackageReference Include="HtmlSanitizer" Version="5.0.376" />
     <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" />

+ 29 - 30
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -31,6 +31,35 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="DnsClient" Version="1.3.2" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.29" />
+        <PackageReference Include="HtmlSanitizer" Version="5.0.376" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="5.0" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0" />
+        <PackageReference Include="System.Drawing.Common" Version="5.0" />
+        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="5.0" />
+        <PackageReference Include="System.Management" Version="5.0" />
+        <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+        <PackageReference Include="SharpCompress" Version="0.27.1" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
+    </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
+    </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net5'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
+    </ItemGroup>
     <ItemGroup>
         <Compile Include="..\Masuit.Tools.Abstractions\Config\CoreConfig.cs" Link="Config\CoreConfig.cs" />
         <Compile Include="..\Masuit.Tools.Abstractions\Database\DataTableBuilder.cs">
@@ -349,36 +378,6 @@
         <DocumentationFile></DocumentationFile>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="DnsClient" Version="1.3.2" />
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.29" />
-        <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="5.0" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <!--<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />-->
-        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0" />
-        <PackageReference Include="System.Drawing.Common" Version="5.0" />
-        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="5.0" />
-        <PackageReference Include="System.Management" Version="5.0" />
-        <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-        <PackageReference Include="SharpCompress" Version="0.26.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
-    </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
-    </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net5'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
-    </ItemGroup>
     <ItemGroup>
         <None Update="Masuit.Tools.Core.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

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

@@ -405,7 +405,7 @@
       <Version>1.11.29</Version>
     </PackageReference>
     <PackageReference Include="HtmlSanitizer">
-      <Version>5.0.372</Version>
+      <Version>5.0.376</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.Mvc">
       <Version>5.2.7</Version>
@@ -414,7 +414,7 @@
       <Version>12.0.3</Version>
     </PackageReference>
     <PackageReference Include="SharpCompress">
-      <Version>0.26.0</Version>
+      <Version>0.27.1</Version>
     </PackageReference>
     <PackageReference Include="StackExchange.Redis">
       <Version>2.2.4</Version>

+ 1 - 1
Test/Masuit.Tools.Abstractions.Test/Masuit.Tools.Abstractions.Test.csproj

@@ -19,7 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.0">
+    <PackageReference Include="coverlet.collector" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

+ 1 - 1
Test/Masuit.Tools.Core.Test/Masuit.Tools.Core.Test.csproj

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