Browse Source

优化Windows执行CMD

懒得勤快 3 years ago
parent
commit
9238441fc2

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

@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.5.5</Version>
+        <Version>2.5.5.1</Version>
         <Authors>懒得勤快</Authors>
         <Description>Masuit.Tools基础公共库,包含一些常用的操作类,大都是静态类,加密解密,反射操作,Excel简单导出,权重随机筛选算法,分布式短id,表达式树,linq扩展,文件压缩,多线程下载和FTP客户端,硬件信息,字符串扩展方法,日期时间扩展操作,中国农历,大文件拷贝,图像裁剪,验证码,断点续传,集合扩展等常用封装。</Description>
         <Copyright>懒得勤快,长空X</Copyright>
@@ -16,9 +16,9 @@
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-        <FileVersion>2.4.6</FileVersion>
+        <FileVersion>$(Version)</FileVersion>
         <Company>masuit.org</Company>
-        <AssemblyVersion>2.4.5.6</AssemblyVersion>
+        <AssemblyVersion>$(Version)</AssemblyVersion>
         <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <IncludeSymbols>true</IncludeSymbols>

+ 12 - 11
Masuit.Tools.Abstractions/Win32/Windows.cs

@@ -94,22 +94,23 @@ namespace Masuit.Tools.Win32
                 };
                 proc.Start();
 
-                using var sr = new System.IO.StreamReader(proc.StandardOutput.BaseStream, Encoding.Default);
-
-                //上面标记的是原文,下面是我自己调试错误后自行修改的
-                Thread.Sleep(100); //貌似调用系统的nslookup还未返回数据或者数据未编码完成,程序就已经跳过直接执行
-                if (!proc.HasExited) //在无参数调用nslookup后,可以继续输入命令继续操作,如果进程未停止就直接执行
-                {
-                    proc.Kill();
-                }
-
-                string txt = sr.ReadToEnd();
                 if (recordLog)
                 {
+                    using var sr = new System.IO.StreamReader(proc.StandardOutput.BaseStream, Encoding.Default);
+
+                    //上面标记的是原文,下面是我自己调试错误后自行修改的
+                    Thread.Sleep(100); //貌似调用系统的nslookup还未返回数据或者数据未编码完成,程序就已经跳过直接执行
+                    if (!proc.HasExited) //在无参数调用nslookup后,可以继续输入命令继续操作,如果进程未停止就直接执行
+                    {
+                        proc.Kill();
+                    }
+
+                    string txt = sr.ReadToEnd();
                     Trace.WriteLine(txt);
+                    return txt;
                 }
 
-                return txt;
+                return "";
             }
             catch (Exception ex)
             {

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

@@ -17,12 +17,12 @@
         <Product>Masuit.Tools.AspNetCore</Product>
         <PackageId>Masuit.Tools.AspNetCore</PackageId>
         <LangVersion>latest</LangVersion>
+        <Version>1.1.5.1</Version>
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>1.1.5</Version>
-        <FileVersion>1.0</FileVersion>
+        <FileVersion>$(Version)</FileVersion>
         <Company>masuit.com</Company>
-        <AssemblyVersion>1.0</AssemblyVersion>
+        <AssemblyVersion>$(Version)</AssemblyVersion>
         <Authors>懒得勤快</Authors>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

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

@@ -20,10 +20,10 @@ github:https://github.com/ldqk/Masuit.Tools
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>2.5.5</Version>
-        <FileVersion>2.4.5.6</FileVersion>
+        <Version>2.5.5.1</Version>
+        <FileVersion>$(Version)</FileVersion>
         <Company>masuit.org</Company>
-        <AssemblyVersion>2.4.5.6</AssemblyVersion>
+        <AssemblyVersion>$(Version)</AssemblyVersion>
         <Authors>懒得勤快</Authors>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

+ 1 - 1
Masuit.Tools.Net45/package.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Masuit.Tools.Net45</id>
-    <version>2.5.5</version>
+    <version>2.5.5.1</version>
     <title>Masuit.Tools</title>
     <authors>懒得勤快</authors>
     <owners>masuit.com</owners>

+ 1 - 1
Masuit.Tools/package.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Masuit.Tools.Net</id>
-    <version>2.5.5</version>
+    <version>2.5.5.1</version>
     <title>Masuit.Tools</title>
     <authors>懒得勤快</authors>
     <owners>masuit.com</owners>