Skip to content

Add SetEntryAssembly() API to System.Reflection #102271

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.

Sign up for GitHub

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
merged 14 commits into from
May 21, 2024
Merged

Add SetEntryAssembly() API to System.Reflection #102271

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cd6bee0
Trying out JanK's approach to override the entry assembly...
ivdiazsa Apr 19, 2024
440b1a2
Fixed what was missing for this reflection scenario to work correctly.
ivdiazsa Apr 30, 2024
3bea613
Merge branch 'main' into managed-contract-facade
ivdiazsa May 15, 2024
7fc6c77
Reverted the compatibility suppressions added by the build script.
ivdiazsa May 15, 2024
2caf450
Forgot to revert also the nativeaot part of the suppressions.
ivdiazsa May 15, 2024
a2f86a5
Addressed PR comments: Updated the tests to use the new
ivdiazsa May 15, 2024
cc6a5fa
Added tests and addressed more comments on the PR.
ivdiazsa May 15, 2024
5a6813e
Added exception test case for SetEntryAssembly, and wrapped all its
ivdiazsa May 16, 2024
d574dad
Update src/libraries/System.Private.CoreLib/src/System/Reflection/Ass…
ivdiazsa May 16, 2024
4d02c7a
Refactored further the tests that force a null entry assembly, and
ivdiazsa May 16, 2024
aac56b3
Apply Jan's suggestions
ivdiazsa May 17, 2024
ccf2ec6
Fixed a sneaky trailing whitespace that was messing up with the code …
ivdiazsa May 17, 2024
b06df49
Changed ConditionalTheory to ConditionalFact in the tests because we'…
ivdiazsa May 17, 2024
671c2f1
Disabled building the CustomHostTests test file when .NET Framework
ivdiazsa May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Internal.Console</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Runtime.CompilerServices.ICastable</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Resources.ResourceManager.BaseNameField</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Resources.ResourceSet.Reader</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
Expand Down
18 changes: 17 additions & 1 deletion src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Internal.Console</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Internal.Metadata.NativeFormat.ArraySignature</Target>
Expand Down Expand Up @@ -825,10 +829,22 @@
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Runtime.CompilerServices.ForceDictionaryLookupsAttribute</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Runtime.CompilerServices.ICastable</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Runtime.CompilerServices.StaticClassConstructionContext</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Resources.ResourceManager.BaseNameField</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>F:System.Resources.ResourceSet.Reader</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Reflection.MethodBase.GetParametersAsSpan</Target>
Expand Down Expand Up @@ -865,4 +881,4 @@
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
</Suppression>
</Suppressions>
</Suppressions>
11 changes: 8 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Reflection/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,17 @@ public override string ToString()
}

// internal test hook
private static bool s_forceNullEntryPoint;
private static Assembly? s_overriddenEntryAssembly;

public static void SetEntryAssembly(Assembly newAssembly)
{
s_overriddenEntryAssembly = newAssembly;
}

public static Assembly? GetEntryAssembly()
{
if (s_forceNullEntryPoint)
return null;
if (s_overriddenEntryAssembly is not null)
return s_overriddenEntryAssembly;

return GetEntryAssemblyInternal();
}
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Runtime/ref/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11125,6 +11125,7 @@ public virtual void GetObjectData(System.Runtime.Serialization.SerializationInfo
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("Types and members the loaded assembly depends on might be removed")]
[System.ObsoleteAttribute("ReflectionOnly loading is not supported and throws PlatformNotSupportedException.", DiagnosticId="SYSLIB0018", UrlFormat="https://aka.ms/dotnet-warnings/{0}")]
public static System.Reflection.Assembly ReflectionOnlyLoadFrom(string assemblyFile) { throw null; }
public static void SetEntryAssembly(System.Reflection.Assembly newAssembly) { throw null; }
public override string ToString() { throw null; }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("Types and members the loaded assembly depends on might be removed")]
public static System.Reflection.Assembly UnsafeLoadFrom(string assemblyFile) { throw null; }
Expand Down