Skip to content

Commit

Permalink
Public release. coreclr \ ILAsm 4.700.1
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
3F committed Nov 3, 2019
1 parent 4c0cdf2 commit 04dc351
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 12 deletions.
7 changes: 4 additions & 3 deletions .modversion.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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')
2 changes: 1 addition & 1 deletion ILAsm.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 34 additions & 8 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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]

Expand All @@ -17,10 +48,5 @@ https://github.com/3F/coreclr
`/CVRES=<path_to_file> 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


0 comments on commit 04dc351

Please sign in to comment.