diff options
| -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, 0 insertions, 6 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index dc655f73ed..47371c33a1 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -5,7 +5,6 @@ <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> <FeatureCollectibleTypes>true</FeatureCollectibleTypes> diff --git a/clr.defines.targets b/clr.defines.targets index 3a41e6926c..b4de3b5614 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -4,7 +4,6 @@ <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> @@ -127,7 +126,6 @@ <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 abd323bf08..682c85a6b6 100644 --- a/clr.desktop.props +++ b/clr.desktop.props @@ -4,7 +4,6 @@ <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 6811ff9015..f844c7b11a 100644 --- a/src/mscorlib/src/System/AppDomain.cs +++ b/src/mscorlib/src/System/AppDomain.cs @@ -1581,7 +1581,6 @@ namespace System [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] internal extern Int32 GetId(); -#if FEATURE_APPDOMAIN_RESOURCE_MONITORING [MethodImplAttribute(MethodImplOptions.InternalCall)] private static extern void nEnableMonitoring(); @@ -1686,7 +1685,6 @@ namespace System return i64LastSurvivedProcessMemory; } } -#endif } /// <summary> |