Skip to content

Cleanup assembly loading code. #47958

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 3 commits into from
Feb 7, 2021
Merged

Cleanup assembly loading code. #47958

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
6b04049
Cleanup the assembly loading code.
vargaz Feb 6, 2021
aaa358b
Remove the 'problematic' assembly code.
vargaz Feb 6, 2021
fbc969d
Merge branch 'master' into cleanup-assembly
lambdageek Feb 6, 2021
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
6 changes: 0 additions & 6 deletions src/mono/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,16 @@ set(MONO_CORLIB_VERSION 1A5E0066-58DC-428A-B21C-0AD6CDAE2789)

set(DISABLE_REMOTING 1)
set(DISABLE_APPDOMAINS 1)
set(DISABLE_SHADOW_COPY 1)
set(DISABLE_CLEANUP 1)
set(DISABLE_ASSEMBLY_REMAPPING 1)
set(DISABLE_MDB 1)
set(DISABLE_COM 1)
set(DISABLE_GAC 1)
set(DISABLE_PERFCOUNTERS 1)
set(DISABLE_ATTACH 1)
set(DISABLE_CONFIG 1)
set(DISABLE_CFGDIR_CONFIG 1)
set(DISABLE_VERIFIER 1)

# Dependencies between options
if(DISABLE_ASSEMBLY_REMAPPING)
set(DISABLE_DESKTOP_LOADER 1)
endif()
if(ENABLE_INTERP_LIB)
set(DISABLE_INTERPRETER 1)
endif()
Expand Down
6 changes: 0 additions & 6 deletions src/mono/cmake/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,6 @@
/* Disable generics support */
#cmakedefine DISABLE_GENERICS 1

/* Disable Shadow Copy for AppDomains */
#cmakedefine DISABLE_SHADOW_COPY 1

/* Disable agent attach support */
#cmakedefine DISABLE_ATTACH 1

Expand Down Expand Up @@ -450,9 +447,6 @@
/* Disable String normalization support. */
#cmakedefine DISABLE_NORMALIZATION 1

/* Disable desktop assembly loader semantics. */
#cmakedefine DISABLE_DESKTOP_LOADER 1

/* Disable shared perfcounters. */
#cmakedefine DISABLE_SHARED_PERFCOUNTERS 1

Expand Down
2 changes: 0 additions & 2 deletions src/mono/cmake/options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ option (DISABLE_LOGGING "Disable support debug logging")
option (DISABLE_COM "Disable COM support")
option (DISABLE_SSA "Disable advanced SSA JIT optimizations")
option (DISABLE_GENERICS "Disable generics support")
option (DISABLE_SHADOW_COPY "Disable Shadow Copy for AppDomains")
option (DISABLE_ATTACH "Disable agent attach support")
option (DISABLE_VERIFIER "Disables the verifier")
option (DISABLE_JIT "Disable the JIT, only full-aot mode or interpreter will be supported by the runtime.")
Expand All @@ -23,7 +22,6 @@ option (DISABLE_SIMD "Disable SIMD intrinsics related optimizations.")
option (DISABLE_DEBUGGER_AGENT "Disable Soft Debugger Agent.")
option (DISABLE_PERFCOUNTERS "Disable Performance Counters.")
option (DISABLE_NORMALIZATION "Disable String normalization support.")
option (DISABLE_DESKTOP_LOADER "Disable desktop assembly loader semantics.")
option (DISABLE_SHARED_PERFCOUNTERS "Disable shared perfcounters.")
option (DISABLE_APPDOMAINS "Disable support for multiple appdomains.")
option (DISABLE_REMOTING "Disable remoting support (This disables type proxies and make com non-functional)")
Expand Down
Loading