Browse Source

升级包

懒得勤快 1 year ago
parent
commit
94c73d2e32

+ 1 - 1
BenchmarkTest/BenchmarkTest.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 2
Masuit.Tools.Abstractions/Extensions/BaseType/IDictionaryExtensions.cs

@@ -589,8 +589,7 @@ public static class IDictionaryExtensions
         return @this.TryAdd(key, addValue) ? addValue : @this[key];
     }
 
-#if NETSTANDARD2_1_OR_GREATER
-#else
+#if !NETSTANDARD2_1_OR_GREATER
 
     public static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue value) where TKey : notnull
     {

+ 11 - 8
Masuit.Tools.Abstractions/Win32/WindowsCommand.cs

@@ -24,15 +24,18 @@ public static class WindowsCommand
         if (!string.IsNullOrEmpty(dosCommand))
         {
             using var process = new Process();
-            var startinfo = new ProcessStartInfo(); //创建进程时使用的一组值,如下面的属性
-            startinfo.FileName = "cmd.exe"; //设定需要执行的命令程序
+            var startinfo = new ProcessStartInfo
+            {
+                FileName = "cmd.exe", //设定需要执行的命令程序
+
+                //以下是隐藏cmd窗口的方法
+                Arguments = "/c" + dosCommand, //设定参数,要输入到命令程序的字符,其中"/c"表示执行完命令后马上退出
+                UseShellExecute = false, //不使用系统外壳程序启动
+                RedirectStandardInput = false, //不重定向输入
+                RedirectStandardOutput = true, //重定向输出,而不是默认的显示在dos控制台上
+                CreateNoWindow = true //不创建窗口
+            }; //创建进程时使用的一组值,如下面的属性
 
-            //以下是隐藏cmd窗口的方法
-            startinfo.Arguments = "/c" + dosCommand; //设定参数,要输入到命令程序的字符,其中"/c"表示执行完命令后马上退出
-            startinfo.UseShellExecute = false; //不使用系统外壳程序启动
-            startinfo.RedirectStandardInput = false; //不重定向输入
-            startinfo.RedirectStandardOutput = true; //重定向输出,而不是默认的显示在dos控制台上
-            startinfo.CreateNoWindow = true; //不创建窗口
             process.StartInfo = startinfo;
             if (process.Start()) //开始进程
             {

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

@@ -62,15 +62,15 @@
       <PackageReference Include="System.Net.Http.Json" Version="5.0" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.24]" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.26]" />
       <PackageReference Include="System.Net.Http.Json" Version="6.0.1" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net7'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.15" />
       <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
       <PackageReference Include="System.Net.Http.Json" Version="8.0" />
     </ItemGroup>
 </Project>

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

@@ -49,13 +49,13 @@ github:https://github.com/ldqk/Masuit.Tools
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5.0.17]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.24]" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.26]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net7'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.15" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
     </ItemGroup>
     <ItemGroup>
       <Compile Remove="..\Masuit.Tools.Abstractions\Mapping\**" />

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

@@ -38,7 +38,7 @@
       </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="EPPlus" Version="7.0.5" />
+        <PackageReference Include="EPPlus" Version="7.0.6" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
     <ItemGroup>

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

@@ -223,7 +223,7 @@
       <Version>2.7.10</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>8.0.0</Version>
+      <Version>8.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>

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

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.4" />
+    <PackageReference Include="xunit" Version="2.6.5" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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

@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.4" />
+    <PackageReference Include="xunit" Version="2.6.5" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

+ 6 - 6
Test/Masuit.Tools.Test/Masuit.Tools.Test.csproj

@@ -116,25 +116,25 @@
       <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
-      <Version>2.6.4</Version>
+      <Version>2.6.5</Version>
     </PackageReference>
     <PackageReference Include="xunit.abstractions">
       <Version>2.0.3</Version>
     </PackageReference>
     <PackageReference Include="xunit.analyzers">
-      <Version>1.8.0</Version>
+      <Version>1.9.0</Version>
     </PackageReference>
     <PackageReference Include="xunit.assert">
-      <Version>2.6.4</Version>
+      <Version>2.6.5</Version>
     </PackageReference>
     <PackageReference Include="xunit.core">
-      <Version>2.6.4</Version>
+      <Version>2.6.5</Version>
     </PackageReference>
     <PackageReference Include="xunit.extensibility.core">
-      <Version>2.6.4</Version>
+      <Version>2.6.5</Version>
     </PackageReference>
     <PackageReference Include="xunit.extensibility.execution">
-      <Version>2.6.4</Version>
+      <Version>2.6.5</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />