Merge pull request #564 from ElektroKill/fix/cor20-entrypoint-settings

`ModuleWriter` no longer ignores `Cor20HeaderOptions.EntryPoint` value
0xd4d · Nov 30, 2024 · f618525 · f618525
2 parents 1e0ec26 + 1229681
commit f618525
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
           New-Item -ItemType Directory nuget_files > $null
           Copy-Item src\bin\Release\*.*nupkg nuget_files
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
         with:
           name: nupkg

diff --git a/src/DotNet/Writer/ModuleWriter.cs b/src/DotNet/Writer/ModuleWriter.cs
@@ -301,6 +301,10 @@ void InitializeChunkProperties() {
 		}
 
 		uint GetEntryPoint() {
+			var ep = Options.Cor20HeaderOptions.EntryPoint;
+			if (ep is not null)
+				return ep.Value;
+
 			if (module.ManagedEntryPoint is MethodDef methodEntryPoint)
 				return new MDToken(Table.Method, metadata.GetRid(methodEntryPoint)).Raw;