Skip to content

Fix IsNonBundledAssemblyLoadingSupported condition in PlatformDetection #73235

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
steveisok merged 3 commits into from
Aug 3, 2022
Merged

Fix IsNonBundledAssemblyLoadingSupported condition in PlatformDetection #73235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23b8e6a
Fix IsNonBundledAssemblyLoadingSupported condition in PlatformDetection
Aug 2, 2022
0335593
Revert prop name and add explanation
Aug 2, 2022
3b6940d
Merge remote-tracking branch 'upstream/main' into fix-condition
Aug 2, 2022
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
2 changes: 1 addition & 1 deletion src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private static bool GetLinqExpressionsBuiltWithIsInterpretingOnly()
public static bool IsNotIntMaxValueArrayIndexSupported => s_largeArrayIsNotSupported.Value;

public static bool IsAssemblyLoadingSupported => !IsNativeAot;
public static bool IsNonBundledAssemblyLoadingSupported => !IsAssemblyLoadingSupported && !IsMonoAOT;
public static bool IsNonBundledAssemblyLoadingSupported => IsAssemblyLoadingSupported && !IsMonoAOT;
public static bool IsMethodBodySupported => !IsNativeAot;
public static bool IsDebuggerTypeProxyAttributeSupported => !IsNativeAot;
public static bool HasAssemblyFiles => !string.IsNullOrEmpty(typeof(PlatformDetection).Assembly.Location);
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ public void ExecuteAssemblyByName()
}).Dispose();
}

// In Mono AOT, loading assemblies can happen, but they need to be AOT'd and registered on startup. That is not the case
// with TestAppOutsideOfTPA.exe
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNonBundledAssemblyLoadingSupported))]
public void ExecuteAssembly()
{
Expand Down