diff --git a/Windows/CS/Framework4.0/Utils/Utils/Properties/AssemblyInfo.cs b/Windows/CS/Framework4.0/Utils/Utils/Properties/AssemblyInfo.cs index d9430bb..42dce0e 100644 --- a/Windows/CS/Framework4.0/Utils/Utils/Properties/AssemblyInfo.cs +++ b/Windows/CS/Framework4.0/Utils/Utils/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 //通过使用 "*",如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/Windows/CS/Framework4.0/Utils/Utils/Utils.cs b/Windows/CS/Framework4.0/Utils/Utils/Utils.cs index db30997..4eb18c6 100644 --- a/Windows/CS/Framework4.0/Utils/Utils/Utils.cs +++ b/Windows/CS/Framework4.0/Utils/Utils/Utils.cs @@ -45,16 +45,16 @@ namespace JoyD.Windows.CS /// 计算得到的CRC32校验值 public static uint CalculateCRC32(byte[] data) { - return CalculateCRC32(0xFFFFFFFF, data); + return CalculateCRC32(data, 0xFFFFFFFF); } /// /// 支持增量计算的CRC32-MPEG2算法实现 /// - /// 初始CRC值(用于增量计算) + /// 上次CRC值(用于增量计算,首次为0xFFFFFFFF) /// 要计算CRC32的数据字节数组 /// 计算得到的CRC32校验值 - public static uint CalculateCRC32(uint crc, byte[] data) + public static uint CalculateCRC32(byte[] data, uint crc = 0xFFFFFFFF) { uint polynomial = 0x04C11DB7; diff --git a/Windows/CS/Framework4.0/Utils/publish-nuget.ps1 b/Windows/CS/Framework4.0/Utils/publish-nuget.ps1 index e45f7c1..852737a 100644 --- a/Windows/CS/Framework4.0/Utils/publish-nuget.ps1 +++ b/Windows/CS/Framework4.0/Utils/publish-nuget.ps1 @@ -10,7 +10,25 @@ $targetDllName = "JoyD.Windows.CS.Utils.dll" # 保持与AssemblyName一致, # NuGet包元数据配置 - 在此处修改所有元数据 $packageId = "com.joyd.utils" -$version = "1.0.0.0" # 更新版本号以确保用户安装的是修复后的版本 + +# 从AssemblyInfo.cs的AssemblyFileVersion获取版本号 +$assemblyInfoPath = Join-Path $scriptDir "Utils\Properties\AssemblyInfo.cs" +if (Test-Path $assemblyInfoPath) { + $assemblyInfoContent = Get-Content -Path $assemblyInfoPath -Encoding UTF8 -Raw + + # 只从AssemblyFileVersion获取版本号 + $fileVersionMatch = [regex]::Match($assemblyInfoContent, '(?