Skip to content

Commit 878a4a9

Browse files
3F3F
committed
Updated IL Assembler to support modern .typeref
1 parent b3d4168 commit 878a4a9

File tree

8 files changed

+38
-19
lines changed

8 files changed

+38
-19
lines changed

‎.tools/DllExport.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
<summary>.NET DllExport with .NET Core support (aka 3F/DllExport aka DllExport.bat)</summary>
3232
<tags>DllExport unmanaged-exports ildasm ilasm coreclr exported-functions dotnetcore Conari pinvoke net-c-func native tools dotnet-DllExport unmanaged-export hMSBuild GetNuTool MvsSln</tags>
3333
<releaseNotes> changelog: https://github.com/3F/DllExport/blob/master/changelog.txt </releaseNotes>
34-
<copyright>Copyright (c) 2009-2015 Robert Giesecke | Copyright (c) 2016-2024 Denis Kuzmin &lt;[email protected]&gt; github/3F </copyright>
34+
<copyright>Copyright (c) 2009-2015 Robert Giesecke | Copyright (c) 2016-2025 Denis Kuzmin &lt;[email protected]&gt; github/3F </copyright>
3535
</metadata>
3636
</package>

‎.vssbe

+26-8
Original file line numberDiff line numberDiff line change
@@ -403,19 +403,37 @@
403403
{
404404
"Enabled": true,
405405
"Name": "ActILAsm",
406-
"Caption": "Provide our ILAsm & ILDasm",
406+
"Caption": "IL Assembler and Disassembler",
407407
"IgnoreIfBuildFailed": true,
408408
"Mode": {
409409
"$type": "net.r_eg.vsSBE.Events.ModeScript, vsSolutionBuildEvent",
410410
"Type": "Script",
411411
"Command__": [
412-
"#[IO copy.file({",
413-
" \"packages/ILAsm/bin/Win.x86/*.dll\",",
414-
" \"packages/ILAsm/bin/Win.x86/*.exe\",",
415-
" \"packages/ILAsm/*.txt\",",
416-
" \"packages/ILAsm/*.md\"",
417-
" }, ",
418-
" \"$(odir)/tools/coreclr/\", true)]"
412+
"#[$(ILAsmDir = \"src/coreclr/artifacts/pkg/Release/ILAsm/\")]",
413+
"#[$(ILAsmDirBinX86 = \"$(ILAsmDir)bin/Win.x86/\")]",
414+
"#[$(ILAsmDirBinX64 = \"$(ILAsmDir)bin/Win.x64/\")]",
415+
"",
416+
"#[( $(_dxpILAsmBinX) != 64 ) { #[$(ILAsmDirBin = $(ILAsmDirBinX86))] }",
417+
"else { #[$(ILAsmDirBin = $(ILAsmDirBinX64))] }]",
418+
"",
419+
"#[( #[IO exists.file(\"$(ILAsmDirBin)ilasm.exe\")] )",
420+
"{",
421+
" #[IO copy.file(",
422+
" { \"$(ILAsmDirBin)*.*\", \"$(ILAsmDir)*.txt\", \"$(ILAsmDir)*.md\" },",
423+
" \"$(odir)/tools/coreclr/\", true)]",
424+
"}",
425+
"else",
426+
"{",
427+
" #[IO copy.file(",
428+
" {",
429+
" \"packages/ILAsm/bin/Win.x86/*.dll\",",
430+
" \"packages/ILAsm/bin/Win.x86/*.exe\",",
431+
" \"packages/ILAsm/*.txt\",",
432+
" \"packages/ILAsm/*.md\"",
433+
" }, ",
434+
" \"$(odir)/tools/coreclr/\", true)]",
435+
"}]",
436+
""
419437
]
420438
}
421439
},

‎3rd-party-NOTICES.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DllExport - https://github.com/3F/DllExport
55

66
## DllExport project may include or reference:
77

8-
* coreclr IL assembler and disassembler
8+
* 3F's IL Assembler and Disassembler
99
https://github.com/3F/coreclr
1010

1111
* Microsoft Build (MSBuild)
@@ -45,12 +45,12 @@ DllExport - https://github.com/3F/DllExport
4545

4646
## Notices for informational purposes only
4747

48-
### Notice for coreclr IL assembler and disassembler
48+
### Notice for 3F's IL Assembler and Disassembler
4949

5050
The MIT License (MIT)
5151

5252
Copyright (c) .NET Foundation and Contributors
53-
Copyright (c) 2016-2019 Denis Kuzmin < [email protected] > GitHub/3F
53+
Copyright (c) 2016-2025 Denis Kuzmin <[email protected]> github/3F
5454

5555
All rights reserved.
5656

‎LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2009-2015 Robert Giesecke
4-
Copyright (c) 2016-2024 Denis Kuzmin <[email protected]> github/3F
4+
Copyright (c) 2016-2025 Denis Kuzmin <[email protected]> github/3F
55
Copyright (c) DllExport contributors https://github.com/3F/DllExport/graphs/contributors
66

77
Permission is hereby granted, free of charge, to any person obtaining a copy

‎Readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Based on *UnmanagedExports* that was created by Robert Giesecke. His [page](http
2222

2323
```
2424
Copyright (c) 2009-2015 Robert Giesecke
25-
Copyright (c) 2016-2024 Denis Kuzmin <[email protected]> github/3F
25+
Copyright (c) 2016-2025 Denis Kuzmin <[email protected]> github/3F
2626
```
2727

2828
> [ ***[Quick start](https://github.com/3F/DllExport/wiki/Quick-start)*** ] [ [Examples: C++, C#, Java, ...](https://github.com/3F/DllExport/wiki/Examples) ]

‎build.bat

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
:: build [[configuration] | [# [option [keys]]]
22
:: https://github.com/3F/DllExport
33
@echo off & if "%~1"=="#" (
4-
if "%~2"=="coreclr-ilasm" ( if "%~3"=="" echo -x64& echo -x86& echo -all -x86 -x64& exit /B0
5-
if not exist src\coreclr\.gitignore call git submodule update --init --recursive coreclr
6-
setlocal & cd src\coreclr & build-s %3 %4 %5 %6 -release
4+
if "%~2"=="ilasm" ( if "%~3"=="" echo -x64& echo -x86& exit /B0
5+
if not exist src\coreclr\.gitignore call git submodule update --init src/coreclr
6+
if "%~3"=="-x86" set "_dxpILAsmBinX=86"
7+
setlocal & cd src\coreclr & build.ilasm %3 -release
78

89
) else if /I "%~2"=="CI" (
910
shift & shift & setlocal

‎src/DllExport/Manager/batch/Manager.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ goto commands
126126
echo.
127127
echo .NET DllExport $-version-$
128128
echo Copyright (c) 2009-2015 Robert Giesecke
129-
echo Copyright (c) 2016-2024 Denis Kuzmin ^<x-3F@outlook.com^> github/3F
129+
echo Copyright (c) 2016-2025 Denis Kuzmin ^<x-3F@outlook.com^> github/3F
130130
echo.
131131
echo MIT License
132132
echo https://github.com/3F/DllExport

‎src/coreclr

0 commit comments

Comments
 (0)