summaryrefslogtreecommitdiff
path: root/clr.coreclr.props
diff options
context:
space:
mode:
authorVictor "Nate" Graf <nategraf1@gmail.com>2018-01-02 17:47:20 (GMT)
committerGitHub <noreply@github.com>2018-01-02 17:47:20 (GMT)
commitc1bbdae7964b19b7063074d36e6af960f0cdc3a0 (patch)
treee554fc74fbb22c6ce9dd488fb02ba4f08ee89e89 /clr.coreclr.props
parent35bba0c5b29e9dfd2744b09e577f6111ef7de9d7 (diff)
downloadcoreclr-c1bbdae7964b19b7063074d36e6af960f0cdc3a0.zip
coreclr-c1bbdae7964b19b7063074d36e6af960f0cdc3a0.tar.gz
coreclr-c1bbdae7964b19b7063074d36e6af960f0cdc3a0.tar.bz2
Retry: Enable EventPipe across Unix and Windows (#15611)
* Revert "Revert "Enable EventPipe across Unix and Windows (#14772)" (#15609)" This reverts commit 302005ca8ae14eade37ddf4ac6e900617c1c166a. * Fix ARM build break * Use more explicit references to resolve build failures * Fix compat with python3 * Disable FeaturePerfTracing on Windows as it is not ready * Disable test for incomplete functionality * Fix test diabled patterns * Add license header * Use keyword types for managed code * Add message prefix * More precisly condition generation of eventing sources * Remove erroneously added changes
Diffstat (limited to 'clr.coreclr.props')
-rw-r--r--clr.coreclr.props10
1 files changed, 3 insertions, 7 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props
index 691365c..029ddca 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -3,6 +3,7 @@
<FeatureEventTrace>true</FeatureEventTrace>
<FeatureICastable>true</FeatureICastable>
<FeatureManagedEtwChannels>true</FeatureManagedEtwChannels>
+ <FeatureManagedEtw>true</FeatureManagedEtw>
<ProfilingSupportedBuild>true</ProfilingSupportedBuild>
</PropertyGroup>
@@ -16,12 +17,12 @@
<FeatureStubsAsIL>true</FeatureStubsAsIL>
<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>
<FeatureCominterop>true</FeatureCominterop>
@@ -32,9 +33,4 @@
<FeatureAppX>true</FeatureAppX>
<FeatureWin32Registry>true</FeatureWin32Registry>
</PropertyGroup>
-
- <PropertyGroup Condition="'$(TargetsLinux)' == 'true'">
- <FeatureManagedEtw>true</FeatureManagedEtw>
- <FeaturePerfTracing>true</FeaturePerfTracing>
- </PropertyGroup>
-</Project>
+</Project> \ No newline at end of file