forked from mkaring/ConfuserEx
-
Notifications
You must be signed in to change notification settings - Fork 5
fix(core): skip rewriting CoreCLR netstandard facades #102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
mcpolo99
merged 1 commit into
mcpolo99:develop
from
fightroad:fix/coreclr-netstandard-facade
Sep 21, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -45,32 +45,40 @@ public AssemblyDef Resolve(IAssembly assembly, ModuleDef sourceModule) { | |||||
| } | ||||||
|
|
||||||
| if (resolvedAssemblyDef?.Name == "netstandard" && 0 < resolvedAssemblyDef.ManifestModule.ExportedTypes.Count) { | ||||||
| // Move types from AssemblyRef to here | ||||||
| // Classic netstandard facades forward to mscorlib, which actually defines the types. | ||||||
| // Moving those types in keeps the confused module referencing netstandard only. | ||||||
| // CoreCLR publish output is different: netstandard.dll only forwards to System.Runtime, | ||||||
| // and that assembly forwards again to System.Private.CoreLib. Clearing the forwards | ||||||
| // there hides System.Object and breaks later analysis. | ||||||
| var module = resolvedAssemblyDef.ManifestModule; | ||||||
| var newTypes = new List<TypeDef>(); | ||||||
| var allAssemblyRefs = new List<AssemblyDef>(); | ||||||
|
|
||||||
| module.ExportedTypes.Clear(); | ||||||
|
|
||||||
| var referenced = new List<AssemblyDef>(); | ||||||
| foreach (var assemblyRef in module.GetAssemblyRefs()) { | ||||||
| var subAss = | ||||||
| InternalExactResolver.Resolve(assemblyRef, module) ?? | ||||||
| InternalFuzzyResolver.Resolve(assemblyRef, module); | ||||||
| allAssemblyRefs.Add(subAss); | ||||||
| foreach (var subModule in subAss?.Modules) { | ||||||
| foreach (var defType in subModule.Types) { | ||||||
| if (subAss != null) | ||||||
| referenced.Add(subAss); | ||||||
| } | ||||||
|
|
||||||
| // Only rewrite when a referenced assembly actually defines System.Object | ||||||
| // (the mscorlib case). CoreCLR facades only forward it onward. | ||||||
|
Comment on lines
+63
to
+64
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| if (!referenced.Any(DefinesSystemObject)) | ||||||
| return resolvedAssemblyDef; | ||||||
|
|
||||||
| var newTypes = new List<TypeDef>(); | ||||||
| module.ExportedTypes.Clear(); | ||||||
|
|
||||||
| foreach (var subAss in referenced) { | ||||||
| foreach (var subModule in subAss.Modules) { | ||||||
| foreach (var defType in subModule.Types) | ||||||
| newTypes.Add(defType); | ||||||
| } | ||||||
| subModule.Types.Clear(); | ||||||
| foreach (var defType in newTypes) { | ||||||
| foreach (var defType in newTypes) | ||||||
| module.Types.Add(defType); | ||||||
| } | ||||||
| newTypes.Clear(); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Remove them because their types has been removed. | ||||||
| foreach (var subAss in allAssemblyRefs) { | ||||||
| // Their types now live on netstandard, so they must not stay cached. | ||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Drop;
Suggested change
|
||||||
| InternalExactResolver.Remove(subAss); | ||||||
| InternalFuzzyResolver.Remove(subAss); | ||||||
| } | ||||||
|
|
@@ -79,6 +87,17 @@ public AssemblyDef Resolve(IAssembly assembly, ModuleDef sourceModule) { | |||||
| return resolvedAssemblyDef; | ||||||
| } | ||||||
|
|
||||||
| static bool DefinesSystemObject(AssemblyDef assembly) { | ||||||
| foreach (var module in assembly.Modules) { | ||||||
| foreach (var type in module.Types) { | ||||||
| if (type.Namespace == "System" && type.Name == "Object") | ||||||
| return true; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| public void Clear() { | ||||||
| InternalExactResolver.Clear(); | ||||||
| InternalFuzzyResolver.Clear(); | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Collapse this block to a one-line reference; the code below is self-describing: