diff --git a/.modversion.ps1 b/.modversion.ps1 index 08aa99b4e134..4b49e4b91c00 100644 --- a/.modversion.ps1 +++ b/.modversion.ps1 @@ -11,15 +11,16 @@ $nvf = Get-Content $vNative $raw = ($nvf | Select-String -Pattern 'VER_PRODUCTVERSION_STR[^"]+"([^"]+)"').Matches.Groups[1].Value $v = ($raw | Select-String -Pattern '(\d+),(\d+),(\d+),(\d+)\s*@Commit:\s*([0-9a-fA-F]+)').Matches.Groups -$modversion = '{0}.{1}.{2}' -f $v[1],$v[2],$mdv +$modversion = '{0}.{1}.{2}' -f $v[1],$v[2],$mdv +$modverPlusSha1 = '{0}+{1}' -f $modversion,$v[5].Value.Substring(0, 9) Add-Content $vNative ('#define VER_3FMOD_BSHA1_STR "{0}"' -f $v[5]) -Add-Content $vNative ('#define VER_3FMOD_PRODUCT_STR "{0}+{1}"' -f $modversion,$v[5].Value.Substring(0, 9)) +Add-Content $vNative ('#define VER_3FMOD_PRODUCT_STR "{0}"' -f $modverPlusSha1) # ILAsm .nuspec $ILAsm = "ILAsm.nuspec" -(Get-Content ".\$ILAsm").Replace('%Version%', $modversion) | Set-Content "$ObjDir\$ILAsm" +(Get-Content ".\$ILAsm").Replace('%Version%', $modversion).Replace('%VersionFull%', $modverPlusSha1) | Set-Content "$ObjDir\$ILAsm" Set-Content ($ObjDir + '.version.txt' ) ("{0}+{1}: {2}" -f $modversion, $v[5], 'https://github.com/3F/coreclr') \ No newline at end of file diff --git a/ILAsm.nuspec b/ILAsm.nuspec index 1fa8e296e055..fd27dded0e02 100644 --- a/ILAsm.nuspec +++ b/ILAsm.nuspec @@ -15,7 +15,7 @@ Custom version on .NET Core CLR (CoreCLR) 3.0 Target platforms: Win.x64 and Win.x86 - %Version% + %VersionFull% _ _ _ _ _ _ https://github.com/3F/coreclr diff --git a/changelog.txt b/changelog.txt index 113dd884fac8..0e7742cc5d68 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,38 @@ -https://github.com/3F/coreclr -- - - - - - - - - - - - - - - - +coreclr \ ILAsm - https://github.com/3F/coreclr +- - - - - - - - - + + +[v4.700.1] + + * FIXED: ILDAsm. Fixed dasm.rc to correctly display list of available commands in console. + + * FIXED: ILAsm /CVRES key & trailing spaces from double quotes. Issue #5. + + * CHANGED: Updated coreclr 3.0.0 + + * CHANGED: ILDAsm. Added /NOBAR key (disassembly progress) to eliminate the difference between other versions. + Helpful for projects like .NET DllExport that can use various versions. + + * CHANGED: Added the following tools to nupkg packages for related build processes. + + https://nuget.org/packages/ILAsm + * tools\gnt.bat - https://github.com/3F/GetNuTool + * tools\hMSBuild.bat - https://github.com/3F/hMSBuild + + * CHANGED: Updated original fixes for ILAsm & ILDAsm that points to coreclr 3 release. + + * NOTE: Don't forget to provide compatible converter of resources to obj COFF-format when using ILAsm. + Use /CVRES (/CVR) key. Related issue: https://github.com/3F/coreclr/issues/2 + + * NOTE: MSBuild Properties for nupkg packages: + ``` + * $(ILAsm_RootPkg) - path to root folder of this package after install. + * $(ILAsm_PathToBin) - path to `\bin` folder., eg.: $(ILAsm_PathToBin)Win.x64\ilasm.exe + ``` + + * NOTE: PDB files (240 MB+) are available through GitHub Releases: + https://github.com/3F/coreclr/releases -# coreclr \ ILAsm [v4.5.1] @@ -17,10 +48,5 @@ https://github.com/3F/coreclr `/CVRES= Set path to cvtres tool: /CVR=cvtres.exe /CVR=tool\cvtres.cmd /CVR=D:\tool\` * NOTE: based on 4.5.22220.0 / coreclr 1.0.4 - ^ ^ ^ ^ - | | | |-- VER_FILEVERSIONREVISION - | | |------- VER_FILEVERSIONBUILD - | |---------- VER_FILEVERSIONMINOR - |------------ VER_MAJORVERSION