diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-01-23 08:43:46 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-01-23 08:43:46 -0800 |
| commit | 25e6c725c74725314f95c3a7dd5ccdaefa912598 (patch) | |
| tree | ceaec47ea6b212825771f546039158a27079aaf8 | |
| parent | 6259c97b4f56218cd2154c0c1b17d565f4c2bd05 (diff) | |
| download | coreclr-25e6c725c74725314f95c3a7dd5ccdaefa912598.tar.gz coreclr-25e6c725c74725314f95c3a7dd5ccdaefa912598.tar.bz2 coreclr-25e6c725c74725314f95c3a7dd5ccdaefa912598.zip | |
Revert "remove FEATURE_APPDOMAIN_RESOURCEMONITORING from corelib"
This reverts commit 9c6de0b7af3716eea3fc16a91ab8b7c2c92e6e98.
| -rw-r--r-- | clr.coreclr.props | 1 | ||||
| -rw-r--r-- | clr.defines.targets | 2 | ||||
| -rw-r--r-- | clr.desktop.props | 1 | ||||
| -rw-r--r-- | src/mscorlib/src/System/AppDomain.cs | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index ed5dd1a2ec..8862ed0763 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -5,6 +5,7 @@ <DebuggingSupportedBuild>true</DebuggingSupportedBuild> <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported> <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls> + <FeatureAppdomainResourceMonitoring>true</FeatureAppdomainResourceMonitoring> <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL> <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL> <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport> diff --git a/clr.defines.targets b/clr.defines.targets index 74b815f8db..7a6ff9f249 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -4,6 +4,7 @@ <CDefines Condition="'$(DebuggingSupported)' == 'true'">$(CDefines);DEBUGGING_SUPPORTED</CDefines> <CDefines Condition="'$(EnCSupported)' == 'true'">$(CDefines);EnC_SUPPORTED</CDefines> <CDefines Condition="'$(EnableDownlevelForNls)' == 'true'">$(CDefines);ENABLE_DOWNLEVEL_FOR_NLS</CDefines> + <CDefines Condition="'$(FeatureAppdomainResourceMonitoring)' == 'true'">$(CDefines);FEATURE_APPDOMAIN_RESOURCE_MONITORING</CDefines> <CDefines Condition="'$(FeatureAppdomainmanagerInitoptions)' == 'true'">$(CDefines);FEATURE_APPDOMAINMANAGER_INITOPTIONS</CDefines> <CDefines Condition="'$(FeatureAppX)' == 'true'">$(CDefines);FEATURE_APPX</CDefines> <CDefines Condition="'$(FeatureAppXBinder)' == 'true'">$(CDefines);FEATURE_APPX_BINDER</CDefines> @@ -110,6 +111,7 @@ <DefineConstants Condition="'$(BuildTypeRet)' == 'true'">$(DefineConstants);BUILDTYPE_RET</DefineConstants> <DefineConstants Condition="'$(FeatureAppdomainmanagerInitoptions)' == 'true'">$(DefineConstants);FEATURE_APPDOMAINMANAGER_INITOPTIONS</DefineConstants> + <DefineConstants Condition="'$(FeatureAppdomainResourceMonitoring)' == 'true'">$(DefineConstants);FEATURE_APPDOMAIN_RESOURCE_MONITORING</DefineConstants> <DefineConstants Condition="'$(FeatureAppX)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants> <DefineConstants Condition="'$(FeatureAppXBinder)' == 'true'">$(DefineConstants);FEATURE_APPX_BINDER</DefineConstants> <DefineConstants Condition="'$(FeatureAptca)' == 'true'">$(DefineConstants);FEATURE_APTCA</DefineConstants> diff --git a/clr.desktop.props b/clr.desktop.props index d3768a8a64..de3f0634a6 100644 --- a/clr.desktop.props +++ b/clr.desktop.props @@ -4,6 +4,7 @@ <DebuggingSupportedBuild>true</DebuggingSupportedBuild> <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported> <EnableDownlevelForNls>true</EnableDownlevelForNls> + <FeatureAppdomainResourceMonitoring>true</FeatureAppdomainResourceMonitoring> <FeatureAppdomainmanagerInitoptions>true</FeatureAppdomainmanagerInitoptions> <FeatureAppX>true</FeatureAppX> <FeatureAppXBinder>true</FeatureAppXBinder> diff --git a/src/mscorlib/src/System/AppDomain.cs b/src/mscorlib/src/System/AppDomain.cs index c8ef2d50f5..8d1e3cb5a9 100644 --- a/src/mscorlib/src/System/AppDomain.cs +++ b/src/mscorlib/src/System/AppDomain.cs @@ -1561,6 +1561,7 @@ namespace System [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] internal extern Int32 GetId(); +#if FEATURE_APPDOMAIN_RESOURCE_MONITORING [MethodImplAttribute(MethodImplOptions.InternalCall)] private static extern void nEnableMonitoring(); @@ -1665,6 +1666,7 @@ namespace System return i64LastSurvivedProcessMemory; } } +#endif } /// <summary> |