diff options
| -rw-r--r-- | clr.coreclr.props | 1 | ||||
| -rw-r--r-- | clr.defines.targets | 2 | ||||
| -rw-r--r-- | clr.props | 9 | ||||
| -rw-r--r-- | src/mscorlib/mscorlib.shared.sources.props | 10 |
4 files changed, 6 insertions, 16 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index c8c391ced2..a036310b50 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -8,7 +8,6 @@ <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL> <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL> <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport> - <FeatureCoreclr>true</FeatureCoreclr> <FeatureCorruptingExceptions>true</FeatureCorruptingExceptions> <FeatureDbiDebugging>true</FeatureDbiDebugging> <FeatureDbiOopDebugging_HostLocal>false</FeatureDbiOopDebugging_HostLocal> diff --git a/clr.defines.targets b/clr.defines.targets index 98dff71fbb..66736c6c60 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -26,7 +26,6 @@ <CDefines Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'">$(CDefines);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION</CDefines> <!-- Enables code required to activate managed winrt from native--> <CDefines Condition="'$(FeatureCominteropWinRTDesktopHost)' == 'true'">$(CDefines);FEATURE_COMINTEROP_WINRT_DESKTOP_HOST</CDefines> <CDefines Condition="'$(FeatureCompressedstack)' == 'true'">$(CDefines);FEATURE_COMPRESSEDSTACK</CDefines> - <CDefines Condition="'$(FeatureCoreclr)' == 'true'">$(CDefines);FEATURE_CORECLR</CDefines> <CDefines Condition="'$(FeatureCoreFxGlobalization)' == 'true'">$(CDefines);FEATURE_COREFX_GLOBALIZATION</CDefines> <CDefines Condition="'$(FeatureCoreSystem)' == 'true'">$(CDefines);FEATURE_CORESYSTEM</CDefines> <CDefines Condition="'$(FeatureCorruptingExceptions)' == 'true'">$(CDefines);FEATURE_CORRUPTING_EXCEPTIONS</CDefines> @@ -142,7 +141,6 @@ <DefineConstants Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION</DefineConstants> <DefineConstants Condition="'$(FeatureCominteropWinRTDesktopHost)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_WINRT_DESKTOP_HOST</DefineConstants> <DefineConstants Condition="'$(FeatureCompressedstack)' == 'true'">$(DefineConstants);FEATURE_COMPRESSEDSTACK</DefineConstants> - <DefineConstants Condition="'$(FeatureCoreclr)' == 'true'">$(DefineConstants);FEATURE_CORECLR</DefineConstants> <DefineConstants Condition="'$(FeatureCoreFxGlobalization)' == 'true'">$(DefineConstants);FEATURE_COREFX_GLOBALIZATION</DefineConstants> <DefineConstants Condition="'$(FeatureCoreSystem)' == 'true'">$(DefineConstants);FEATURE_CORESYSTEM</DefineConstants> <DefineConstants Condition="'$(FeatureCorruptingExceptions)' == 'true'">$(DefineConstants);FEATURE_CORRUPTING_EXCEPTIONS</DefineConstants> @@ -162,14 +162,7 @@ <LinkUseCMT>true</LinkUseCMT> --> </PropertyGroup> - - <PropertyGroup> - <MainClrModuleName Condition="'$(FeatureCoreclr)'=='true'">coreclr</MainClrModuleName> - <MainClrModuleName Condition="'$(FeatureCoreclr)'!='true'">clr</MainClrModuleName> - <MainDacMouleName Condition="'$(FeatureCoreclr)'=='true'">mscordaccore</MainDacMouleName> - <MainDacMouleName Condition="'$(FeatureCoreclr)'!='true'">mscordacwks</MainDacMouleName> - </PropertyGroup> - + <PropertyGroup> <DebugBuild Condition="'$(NTDEBUG)' == '' or '$(NTDEBUG)'=='ntsdnodbg'">false</DebugBuild> <DebugBuild Condition="'$(NTDEBUG)' != '' and '$(NTDEBUG)'!='ntsdnodbg'">true</DebugBuild> diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props index 95d19fbc36..430ef27a56 100644 --- a/src/mscorlib/mscorlib.shared.sources.props +++ b/src/mscorlib/mscorlib.shared.sources.props @@ -119,7 +119,7 @@ <InteropSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\InvalidComObjectException.cs" /> <InteropSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\SafeArrayRankMismatchException.cs" /> <InteropSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\SafeArrayTypeMismatchException.cs" /> - <InteropSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\Runtime\InteropServices\NativeCallableAttribute.cs" /> + <InteropSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\NativeCallableAttribute.cs" /> <InteropSources Condition="'$(FeatureCominterop)' != 'true'" Include="$(BclSourcesRoot)\System\Runtime\InteropServices\NonPortable.cs" /> <InteropSources Condition="'$(FeatureCominterop)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\InteropServices\DispatchWrapper.cs" /> <InteropSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ICustomFactory.cs" /> @@ -217,7 +217,7 @@ <SystemSources Include="$(BclSourcesRoot)\System\AppContext\AppContext.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\AppContext\AppContextSwitches.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\AppContext\AppContextDefaultValues.cs" /> - <SystemSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\AppContext\AppContextDefaultValues.CoreClrOverrides.cs" /> + <SystemSources Include="$(BclSourcesRoot)\System\AppContext\AppContextDefaultValues.CoreClrOverrides.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\AppContext\AppContextDefaultValues.Defaults.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\AppContext\AppContextDefaultValues.Defaults.Central.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\CurrentTimeZone.cs" /> @@ -290,7 +290,7 @@ <SystemSources Include="$(BclSourcesRoot)\System\TypeUnloadedException.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\cominterfaces.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\CompatibilitySwitches.cs" /> - <SystemSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\LowLevelConsole.cs" /> + <SystemSources Include="$(BclSourcesRoot)\System\LowLevelConsole.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\ContextMarshalException.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\Convert.cs" /> <SystemSources Include="$(BclSourcesRoot)\System\StringFreezingAttribute.cs" /> @@ -422,7 +422,7 @@ <SystemSources Include="$(BclSourcesRoot)\System\TimeZoneInfo.Win32.cs" /> </ItemGroup> <ItemGroup> - <InternalSources Condition="'$(FeatureCoreclr)' == 'true'" Include="$(BclSourcesRoot)\Internal\Runtime\Augments\EnvironmentAugments.cs" /> + <InternalSources Include="$(BclSourcesRoot)\Internal\Runtime\Augments\EnvironmentAugments.cs" /> <InternalSources Include="$(BclSourcesRoot)\Internal\Runtime\Augments\RuntimeThread.cs" /> </ItemGroup> <ItemGroup> @@ -537,7 +537,7 @@ <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\XXXOnTypeBuilderInstantiation.cs" /> <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\UnmanagedMarshal.cs" /> </ItemGroup> - <ItemGroup Condition="'$(FeatureCoreclr)' == 'true'"> + <ItemGroup> <ReflectionMetadataSources Include="$(BclSourcesRoot)\System\Reflection\Metadata\AssemblyExtensions.cs" /> </ItemGroup> <ItemGroup> |