优化VersionNumber

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

@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6;net7;net8</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.6.8</Version>
+        <Version>2.6.8.1</Version>
         <Authors>懒得勤快</Authors>
         <Description>全龄段友好的C#万能工具库，码数吐司库，不管你是菜鸟新手还是骨灰级玩家都能轻松上手，Masuit.Tools基础公共库(适用于.NET4.6.1/.NET Standard2.0及以上项目)，包含一些常用的操作类，大都是静态类，加密解密，反射操作，Excel简单导出，权重随机筛选算法，分布式短id，表达式树，linq扩展，文件压缩，多线程下载和FTP客户端，硬件信息，字符串扩展方法，日期时间扩展操作，中国农历，大文件拷贝，图像裁剪，验证码，断点续传，集合扩展等常用封装。
             官网教程：https://tools.masuit.org

Masuit.Tools.Abstractions/Models/VersionNumber.cs

@@ -9,218 +9,218 @@ namespace Masuit.Tools.Models;
 [DataContract]
 public sealed record VersionNumber : IComparable, IComparable<VersionNumber>
 {
-	/// <summary>
-	/// 版本号
-	/// </summary>
-	/// <param name="major">主版本号</param>
-	/// <param name="minor">子版本号</param>
-	/// <param name="build">编译版本号</param>
-	/// <param name="revision">修订版本号</param>
-	public VersionNumber(uint major, uint minor, uint build, uint revision) : this(major, minor, build)
-	{
-		Revision = revision;
-	}
-
-	/// <summary>
-	/// 版本号
-	/// </summary>
-	/// <param name="major">主版本号</param>
-	/// <param name="minor">子版本号</param>
-	/// <param name="build">编译版本号</param>
-	public VersionNumber(uint major, uint minor, uint build) : this(major, minor)
-	{
-		Build = build;
-	}
-
-	/// <summary>
-	/// 版本号
-	/// </summary>
-	/// <param name="major">主版本号</param>
-	/// <param name="minor">子版本号</param>
-	public VersionNumber(uint major, uint minor)
-	{
-		Major = major;
-		Minor = minor;
-	}
-
-	/// <summary>
-	/// 版本号
-	/// </summary>
-	public VersionNumber(string version)
-	{
-		if (Version.TryParse(version, out var v))
-		{
-			Major = (uint)Math.Max(0, v.Major);
-			Minor = (uint)Math.Max(0, v.Minor);
-			Build = (uint)Math.Max(0, v.Build);
-			Revision = (uint)Math.Max(0, v.Revision);
-		}
-	}
-
-	/// <summary>
-	/// 版本号
-	/// </summary>
-	public VersionNumber(double version)
-	{
-		Major = (uint)version;
-		Minor = (uint)((version - Major) * 10);
-	}
-
-	/// <summary>
-	/// 字符串转换成版本号
-	/// </summary>
-	/// <param name="v"></param>
-	/// <returns></returns>
-	public static VersionNumber Parse(string v)
-	{
-		return new VersionNumber(v);
-	}
-
-	/// <summary>
-	/// 字符串尝试转换成版本号
-	/// </summary>
-	/// <param name="v"></param>
-	/// <param name="version"></param>
-	/// <returns></returns>
-	public static bool TryParse(string v, out VersionNumber version)
-	{
-		if (Version.TryParse(v, out var ver))
-		{
-			version = new VersionNumber((uint)Math.Max(0, ver.Major), (uint)Math.Max(0, ver.Minor), (uint)Math.Max(0, ver.Build), (uint)Math.Max(0, ver.Revision));
-			return true;
-		}
-
-		version = null;
-		return false;
-	}
-
-	/// <summary>
-	/// 主版本号
-	/// </summary>
-	public uint Major { get; }
-
-	/// <summary>
-	/// 子版本号
-	/// </summary>
-	public uint Minor { get; }
-
-	/// <summary>
-	/// 编译版本号
-	/// </summary>
-	public uint Build { get; }
-
-	/// <summary>
-	/// 修订版本号
-	/// </summary>
-	public uint Revision { get; }
-
-	public short MajorRevision => (short)(Revision >> 16);
-
-	public short MinorRevision => (short)(Revision & 0xFFFF);
-
-	public int CompareTo(object version)
-	{
-		if (version == null)
-		{
-			return 1;
-		}
-
-		if (version is VersionNumber v)
-		{
-			return CompareTo(v);
-		}
-
-		throw new ArgumentException(nameof(version));
-	}
-
-	public int CompareTo(VersionNumber value)
-	{
-		return ReferenceEquals(value, this) ? 0 : value is null ? 1 : Major != value.Major ? (Major > value.Major ? 1 : -1) : Minor != value.Minor ? (Minor > value.Minor ? 1 : -1) : Build != value.Build ? (Build > value.Build ? 1 : -1) : Revision != value.Revision ? (Revision > value.Revision ? 1 : -1) : 0;
-	}
-
-	public bool Equals(VersionNumber obj)
-	{
-		return ReferenceEquals(obj, this) || (!(obj is null) && Major == obj.Major && Minor == obj.Minor && Build == obj.Build && Revision == obj.Revision);
-	}
-
-	public override int GetHashCode()
-	{
-		uint accumulator = 0;
-		accumulator |= (Major & 0x0000000F) << 28;
-		accumulator |= (Minor & 0x000000FF) << 20;
-		accumulator |= (Build & 0x000000FF) << 12;
-		accumulator |= (Revision & 0x00000FFF);
-
-		return (int)accumulator;
-	}
-
-	public override string ToString() => Major + "." + Minor + ("." + Build + "." + Revision).TrimEnd('.', '0');
-
-	public static bool operator <(VersionNumber v1, VersionNumber v2)
-	{
-		if (v1 is null)
-		{
-			return v2 is not null;
-		}
-
-		return v1.CompareTo(v2) < 0;
-	}
-
-	public static bool operator <=(VersionNumber v1, VersionNumber v2)
-	{
-		if (v1 is null)
-		{
-			return true;
-		}
-
-		return v1.CompareTo(v2) <= 0;
-	}
-
-	public static bool operator >(VersionNumber v1, VersionNumber v2) => v2 < v1;
-
-	public static bool operator >=(VersionNumber v1, VersionNumber v2) => v2 <= v1;
-
-	public static VersionNumber operator +(VersionNumber v1, decimal v2)
-	{
-		int major = (int)v2;
-		int minor = (int)((v2 - major) * 10);
-		return new VersionNumber((uint)(v1.Major + major), (uint)(v1.Minor + minor), v1.Build, v1.Revision);
-	}
-
-	public static VersionNumber operator +(VersionNumber v1, double v2)
-	{
-		int major = (int)v2;
-		int minor = (int)((v2 - major) * 10);
-		return new VersionNumber((uint)(v1.Major + major), (uint)(v1.Minor + minor), v1.Build, v1.Revision);
-	}
-
-	public static VersionNumber operator +(VersionNumber v1, int v2)
-	{
-		return new VersionNumber((uint)(v1.Major + v2), v1.Minor, v1.Build, v1.Revision);
-	}
-
-	public static VersionNumber operator +(VersionNumber v1, VersionNumber v2)
-	{
-		return new VersionNumber(v1.Major + v2.Major, v1.Minor + v2.Minor, v1.Build + v2.Build, v1.Revision + v2.Revision);
-	}
-
-	/// <summary>
-	///
-	/// </summary>
-	/// <param name="v"></param>
-	/// <returns></returns>
-	public static implicit operator VersionNumber(string v)
-	{
-		return new VersionNumber(v);
-	}
-
-	/// <summary>
-	///
-	/// </summary>
-	/// <param name="v"></param>
-	/// <returns></returns>
-	public static implicit operator string(VersionNumber v)
-	{
-		return v.ToString();
-	}
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    /// <param name="major">主版本号</param>
+    /// <param name="minor">子版本号</param>
+    /// <param name="build">编译版本号</param>
+    /// <param name="revision">修订版本号</param>
+    public VersionNumber(uint major, uint minor, uint build, uint revision) : this(major, minor, build)
+    {
+        Revision = revision;
+    }
+
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    /// <param name="major">主版本号</param>
+    /// <param name="minor">子版本号</param>
+    /// <param name="build">编译版本号</param>
+    public VersionNumber(uint major, uint minor, uint build) : this(major, minor)
+    {
+        Build = build;
+    }
+
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    /// <param name="major">主版本号</param>
+    /// <param name="minor">子版本号</param>
+    public VersionNumber(uint major, uint minor)
+    {
+        Major = major;
+        Minor = minor;
+    }
+
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    public VersionNumber(string version)
+    {
+        if (Version.TryParse(version, out var v))
+        {
+            Major = (uint)Math.Max(0, v.Major);
+            Minor = (uint)Math.Max(0, v.Minor);
+            Build = (uint)Math.Max(0, v.Build);
+            Revision = (uint)Math.Max(0, v.Revision);
+        }
+    }
+
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    public VersionNumber(double version)
+    {
+        Major = (uint)version;
+        Minor = (uint)((version - Major) * 10);
+    }
+
+    /// <summary>
+    /// 字符串转换成版本号
+    /// </summary>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    public static VersionNumber Parse(string v)
+    {
+        return new VersionNumber(v);
+    }
+
+    /// <summary>
+    /// 字符串尝试转换成版本号
+    /// </summary>
+    /// <param name="v"></param>
+    /// <param name="version"></param>
+    /// <returns></returns>
+    public static bool TryParse(string v, out VersionNumber version)
+    {
+        if (Version.TryParse(v, out var ver))
+        {
+            version = new VersionNumber((uint)Math.Max(0, ver.Major), (uint)Math.Max(0, ver.Minor), (uint)Math.Max(0, ver.Build), (uint)Math.Max(0, ver.Revision));
+            return true;
+        }
+
+        version = null;
+        return false;
+    }
+
+    /// <summary>
+    /// 主版本号
+    /// </summary>
+    public uint Major { get; }
+
+    /// <summary>
+    /// 子版本号
+    /// </summary>
+    public uint Minor { get; }
+
+    /// <summary>
+    /// 编译版本号
+    /// </summary>
+    public uint Build { get; }
+
+    /// <summary>
+    /// 修订版本号
+    /// </summary>
+    public uint Revision { get; }
+
+    public short MajorRevision => (short)(Revision >> 16);
+
+    public short MinorRevision => (short)(Revision & 0xFFFF);
+
+    public int CompareTo(object version)
+    {
+        if (version == null)
+        {
+            return 1;
+        }
+
+        if (version is VersionNumber v)
+        {
+            return CompareTo(v);
+        }
+
+        throw new ArgumentException(nameof(version));
+    }
+
+    public int CompareTo(VersionNumber value)
+    {
+        return ReferenceEquals(value, this) ? 0 : value is null ? 1 : Major != value.Major ? (Major > value.Major ? 1 : -1) : Minor != value.Minor ? (Minor > value.Minor ? 1 : -1) : Build != value.Build ? (Build > value.Build ? 1 : -1) : Revision != value.Revision ? (Revision > value.Revision ? 1 : -1) : 0;
+    }
+
+    public bool Equals(VersionNumber obj)
+    {
+        return ReferenceEquals(obj, this) || (!(obj is null) && Major == obj.Major && Minor == obj.Minor && Build == obj.Build && Revision == obj.Revision);
+    }
+
+    public override int GetHashCode()
+    {
+        uint accumulator = 0;
+        accumulator |= (Major & 0x0000000F) << 28;
+        accumulator |= (Minor & 0x000000FF) << 20;
+        accumulator |= (Build & 0x000000FF) << 12;
+        accumulator |= (Revision & 0x00000FFF);
+
+        return (int)accumulator;
+    }
+
+    public override string ToString() => Major + "." + Minor + ("." + Build + "." + Revision).TrimEnd('.', '0');
+
+    public static bool operator <(VersionNumber v1, VersionNumber v2)
+    {
+        if (v1 is null)
+        {
+            return v2 is not null;
+        }
+
+        return v1.CompareTo(v2) < 0;
+    }
+
+    public static bool operator <=(VersionNumber v1, VersionNumber v2)
+    {
+        if (v1 is null)
+        {
+            return true;
+        }
+
+        return v1.CompareTo(v2) <= 0;
+    }
+
+    public static bool operator >(VersionNumber v1, VersionNumber v2) => v2 < v1;
+
+    public static bool operator >=(VersionNumber v1, VersionNumber v2) => v2 <= v1;
+
+    public static VersionNumber operator +(VersionNumber v1, decimal v2)
+    {
+        int major = (int)v2;
+        int minor = (int)((v2 - major) * 10);
+        return new VersionNumber((uint)(v1.Major + major), (uint)(v1.Minor + minor));
+    }
+
+    public static VersionNumber operator +(VersionNumber v1, double v2)
+    {
+        int major = (int)v2;
+        int minor = (int)((v2 - major) * 10);
+        return new VersionNumber((uint)(v1.Major + major), (uint)(v1.Minor + minor));
+    }
+
+    public static VersionNumber operator +(VersionNumber v1, int v2)
+    {
+        return new VersionNumber((uint)(v1.Major + v2));
+    }
+
+    public static VersionNumber operator +(VersionNumber v1, VersionNumber v2)
+    {
+        return new VersionNumber(v1.Major + v2.Major, v1.Minor + v2.Minor, v1.Build + v2.Build, v1.Revision + v2.Revision);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    public static implicit operator VersionNumber(string v)
+    {
+        return new VersionNumber(v);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    public static implicit operator string(VersionNumber v)
+    {
+        return v.ToString();
+    }
 }

Masuit.Tools.AspNetCore/Masuit.Tools.AspNetCore.csproj

@@ -18,7 +18,7 @@
         <Product>Masuit.Tools.AspNetCore</Product>
         <PackageId>Masuit.Tools.AspNetCore</PackageId>
         <LangVersion>latest</LangVersion>
-        <Version>1.2.8</Version>
+        <Version>1.2.8.1</Version>
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <FileVersion>1.1.9</FileVersion>

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

@@ -6,7 +6,7 @@
 官网教程：https://tools.masuit.org
 github：https://github.com/ldqk/Masuit.Tools
         </Description>
-        <Version>2.6.8</Version>
+        <Version>2.6.8.1</Version>
         <Copyright>Copyright © 懒得勤快</Copyright>
         <PackageProjectUrl>https://github.com/ldqk/Masuit.Tools</PackageProjectUrl>
         <PackageTags>Masuit.Tools,工具库,Utility,Crypt,Extensions</PackageTags>
@@ -21,7 +21,7 @@ github：https://github.com/ldqk/Masuit.Tools
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <FileVersion>2.5.9</FileVersion>
+        <FileVersion>2.5.9.1</FileVersion>
         <Company>masuit.org</Company>
         <AssemblyVersion>2.5.9</AssemblyVersion>
         <Authors>懒得勤快</Authors>

Masuit.Tools.Net45/package.nuspec

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

Masuit.Tools/Masuit.Tools.csproj

@@ -214,7 +214,7 @@
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="SharpCompress">
-      <Version>0.33.0</Version>
+      <Version>0.34.2</Version>
     </PackageReference>
     <PackageReference Include="SixLabors.ImageSharp.Drawing">
       <Version>1.0.0</Version>

Masuit.Tools/package.nuspec

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

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

@@ -14,8 +14,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

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

@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
     <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.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

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

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