X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=clr.coreclr.props;h=029ddca4f7294575b9905a0faf57179ec462ddda;hb=41312365f6fb3d9c71a4103c10f8aaf87e0df6a7;hp=e8c2ff8a63161ae9953211802cef66ad85053682;hpb=a96445ddc2c487b4adf79edd1d90a1646f2120dc;p=platform%2Fupstream%2Fcoreclr.git

diff --git a/clr.coreclr.props b/clr.coreclr.props
index e8c2ff8..029ddca 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -1,64 +1,11 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(ClrProduct)'=='core_clr'">
-    <BuildTypeRet Condition="'$(_BuildType)'=='ret'">true</BuildTypeRet>
-    <DebuggingSupported>true</DebuggingSupported>
-    <DebuggingSupportedBuild>true</DebuggingSupportedBuild>
-    <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported>
-    <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls>
-    <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
-    <FeatureDbiDebugging>true</FeatureDbiDebugging>
-    <FeatureDbiOopDebugging_HostLocal>false</FeatureDbiOopDebugging_HostLocal>
-    <FeatureDbiOopDebugging_HostWindowsx86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostWindowsx86>
-    <FeatureDbiOopDebugging_HostWindowsamd64 Condition="'$(TargetArch)' == 'amd64' or '$(TargetArch)' == 'arm64'">true</FeatureDbiOopDebugging_HostWindowsamd64>
-    <FeatureDbiOopDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostOneCorex86>
-    <FeatureDbiOopDebugging_HostOneCoreamd64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureDbiOopDebugging_HostOneCoreamd64>
+  <PropertyGroup>
     <FeatureEventTrace>true</FeatureEventTrace>
-    <FeatureTieredCompilation>true</FeatureTieredCompilation>
-    <FeatureFrameworkInternal>true</FeatureFrameworkInternal>
-    <FeatureHijack>true</FeatureHijack>
-    <FeatureInteropDebugging Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureInteropDebugging>
-    <FeatureIsymReader>true</FeatureIsymReader>
-    <!-- This is here for testing purposes only, and only on checked builds for x86/ARM -->
-    <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages>
-    <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine>
-    <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
-    <FeaturePrejit>true</FeaturePrejit>
-    <FeatureStandaloneSn>true</FeatureStandaloneSn>
-    <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
-    <FeatureStrongnameTestkeyAllowed>true</FeatureStrongnameTestkeyAllowed>
-    <FeatureSyntheticCultures>true</FeatureSyntheticCultures>
-    <FeatureVersioningLog>true</FeatureVersioningLog>
-    <FeatureWin32Registry>true</FeatureWin32Registry>
-    <FeatureXPlatDacDebugging_HostWindowsx86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureXPlatDacDebugging_HostWindowsx86>
-    <FeatureXPlatDacDebugging_HostWindowsAMD64 Condition="'$(TargetArch)' == 'amd64' or '$(TargetArch)' == 'arm64'">true</FeatureXPlatDacDebugging_HostWindowsAMD64>
-    <FeatureXPlatDacDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureXPlatDacDebugging_HostOneCorex86>
-    <FeatureXPlatDacDebugging_HostOneCoreAMD64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureXPlatDacDebugging_HostOneCoreAMD64>
-    <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
-    <FeatureUseAsmGCWriteBarriers>true</FeatureUseAsmGCWriteBarriers>
-    <!-- Setting this to "false" works only for workstation GC, not server. -->
-    <FeatureSymDiff>true</FeatureSymDiff>
-    <FeatureClassicCominterop>true</FeatureClassicCominterop>
-    <FeatureCominterop>true</FeatureCominterop>
     <FeatureICastable>true</FeatureICastable>
-    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
-    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
-    <FeatureLazyCOWPages Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm')">true</FeatureLazyCOWPages>
-    <FeatureLegacyNetCFDbgHostControl>true</FeatureLegacyNetCFDbgHostControl>
-    <FeatureRandomizedStringHashing>true</FeatureRandomizedStringHashing>
-    <!-- The rejit feature is available only on supported architectures (x86 & x64) -->
-    <FeatureReJIT Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureReJIT>
-    <FeatureManagedEtw>false</FeatureManagedEtw>
     <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels>
-    <BinderDebugLog Condition="'$(_BuildType)'=='dbg'">true</BinderDebugLog>
-    <FeatureAppX>true</FeatureAppX>
-    <FeatureWinMDResilient>true</FeatureWinMDResilient>
-    <!-- 
-        FeatureImplicitTls has been verified to be functionally correct on x86 & amd64.
-        However there is still work to make it on par in terms of performance. So currently only
-        enabling for arm64 
-     -->
-    <FeatureImplicitTls Condition="'$(TargetArch)' == 'arm64'">true</FeatureImplicitTls>
-    <FeatureSvrGc Condition="'$(TargetArch)' != 'arm'">true</FeatureSvrGc>
+    <FeatureManagedEtw>true</FeatureManagedEtw>
+
+    <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
@@ -69,29 +16,21 @@
     <FeatureMulticastStubAsIL>true</FeatureMulticastStubAsIL>
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 
-    <!-- Windows specific features -->
-    <FeatureWin32Registry>false</FeatureWin32Registry>
-    <FeatureAppX>false</FeatureAppX>
-    <FeatureCominteropApartmentSupport>false</FeatureCominteropApartmentSupport>
-    <FeatureClassicCominterop>false</FeatureClassicCominterop>
-    <FeatureCominterop>false</FeatureCominterop>
-    <FeatureCominteropUnmanagedActivation>false</FeatureCominteropUnmanagedActivation>
-    <FeatureCominteropWinRTManagedActivation>false</FeatureCominteropWinRTManagedActivation>
-
     <FeatureCoreFxGlobalization>true</FeatureCoreFxGlobalization>
+    <FeaturePerfTracing>true</FeaturePerfTracing>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
     <FeatureArrayStubAsIL Condition="'$(TargetArch)' != 'i386'">true</FeatureArrayStubAsIL>
     <FeatureMulticastStubAsIL Condition="'$(TargetArch)' != 'i386'">true</FeatureMulticastStubAsIL>
-    <FeatureManagedEtw>true</FeatureManagedEtw>
     <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
     <FeatureUseLcid>true</FeatureUseLcid>
-    <FeatureImplicitLongPath>true</FeatureImplicitLongPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetsLinux)' == 'true'">
-    <FeatureManagedEtw>true</FeatureManagedEtw>
-    <FeaturePerfTracing>true</FeaturePerfTracing>
+    <FeatureCominterop>true</FeatureCominterop>
+    <FeatureClassicCominterop>true</FeatureClassicCominterop>
+    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
+    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
+    <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
+    <FeatureAppX>true</FeatureAppX>
+    <FeatureWin32Registry>true</FeatureWin32Registry>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file