Skip to content

Commit 04dc351

Browse files
committed
Public release. coreclr \ ILAsm 4.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: #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
1 parent 4c0cdf2 commit 04dc351

File tree

3 files changed

+39
-12
lines changed

3 files changed

+39
-12
lines changed

.modversion.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ $nvf = Get-Content $vNative
1111
$raw = ($nvf | Select-String -Pattern 'VER_PRODUCTVERSION_STR[^"]+"([^"]+)"').Matches.Groups[1].Value
1212
$v = ($raw | Select-String -Pattern '(\d+),(\d+),(\d+),(\d+)\s*@Commit:\s*([0-9a-fA-F]+)').Matches.Groups
1313

14-
$modversion = '{0}.{1}.{2}' -f $v[1],$v[2],$mdv
14+
$modversion = '{0}.{1}.{2}' -f $v[1],$v[2],$mdv
15+
$modverPlusSha1 = '{0}+{1}' -f $modversion,$v[5].Value.Substring(0, 9)
1516

1617
Add-Content $vNative ('#define VER_3FMOD_BSHA1_STR "{0}"' -f $v[5])
17-
Add-Content $vNative ('#define VER_3FMOD_PRODUCT_STR "{0}+{1}"' -f $modversion,$v[5].Value.Substring(0, 9))
18+
Add-Content $vNative ('#define VER_3FMOD_PRODUCT_STR "{0}"' -f $modverPlusSha1)
1819

1920
# ILAsm .nuspec
2021

2122
$ILAsm = "ILAsm.nuspec"
2223

23-
(Get-Content ".\$ILAsm").Replace('%Version%', $modversion) | Set-Content "$ObjDir\$ILAsm"
24+
(Get-Content ".\$ILAsm").Replace('%Version%', $modversion).Replace('%VersionFull%', $modverPlusSha1) | Set-Content "$ObjDir\$ILAsm"
2425

2526
Set-Content ($ObjDir + '.version.txt' ) ("{0}+{1}: {2}" -f $modversion, $v[5], 'https://github.com/3F/coreclr')

ILAsm.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Custom version on .NET Core CLR (CoreCLR) 3.0
1616
Target platforms: Win.x64 and Win.x86
1717

18-
%Version%
18+
%VersionFull%
1919
_ _ _ _ _ _
2020

2121
https://github.com/3F/coreclr

changelog.txt

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,38 @@
1-
https://github.com/3F/coreclr
2-
- - - - - - - - - - - - - - - -
1+
coreclr \ ILAsm - https://github.com/3F/coreclr
2+
- - - - - - - - -
3+
4+
5+
[v4.700.1]
6+
7+
* FIXED: ILDAsm. Fixed dasm.rc to correctly display list of available commands in console.
8+
9+
* FIXED: ILAsm /CVRES key & trailing spaces from double quotes. Issue #5.
10+
11+
* CHANGED: Updated coreclr 3.0.0
12+
13+
* CHANGED: ILDAsm. Added /NOBAR key (disassembly progress) to eliminate the difference between other versions.
14+
Helpful for projects like .NET DllExport that can use various versions.
15+
16+
* CHANGED: Added the following tools to nupkg packages for related build processes.
17+
18+
https://nuget.org/packages/ILAsm
19+
* tools\gnt.bat - https://github.com/3F/GetNuTool
20+
* tools\hMSBuild.bat - https://github.com/3F/hMSBuild
21+
22+
* CHANGED: Updated original fixes for ILAsm & ILDAsm that points to coreclr 3 release.
23+
24+
* NOTE: Don't forget to provide compatible converter of resources to obj COFF-format when using ILAsm.
25+
Use /CVRES (/CVR) key. Related issue: https://github.com/3F/coreclr/issues/2
26+
27+
* NOTE: MSBuild Properties for nupkg packages:
28+
```
29+
* $(ILAsm_RootPkg) - path to root folder of this package after install.
30+
* $(ILAsm_PathToBin) - path to `\bin` folder., eg.: $(ILAsm_PathToBin)Win.x64\ilasm.exe
31+
```
32+
33+
* NOTE: PDB files (240 MB+) are available through GitHub Releases:
34+
https://github.com/3F/coreclr/releases
335

4-
# coreclr \ ILAsm
536

637
[v4.5.1]
738

@@ -17,10 +48,5 @@ https://github.com/3F/coreclr
1748
`/CVRES=<path_to_file> Set path to cvtres tool: /CVR=cvtres.exe /CVR=tool\cvtres.cmd /CVR=D:\tool\`
1849

1950
* NOTE: based on 4.5.22220.0 / coreclr 1.0.4
20-
^ ^ ^ ^
21-
| | | |-- VER_FILEVERSIONREVISION
22-
| | |------- VER_FILEVERSIONBUILD
23-
| |---------- VER_FILEVERSIONMINOR
24-
|------------ VER_MAJORVERSION
2551

2652

0 commit comments

Comments
 (0)