From 17ddea3f4a64d58ee5b68bc9dc4984bce2ffe64f Mon Sep 17 00:00:00 2001
From: Brian Robbins <brianrob@microsoft.com>
Date: Tue, 16 Jan 2018 14:19:12 -0800
Subject: [PATCH 1/3] Unconditionally include EventPipe.cs on all platforms.

---
 src/mscorlib/System.Private.CoreLib.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
index 0ff3659a810d..3200555c22b5 100644
--- a/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/mscorlib/System.Private.CoreLib.csproj
@@ -514,7 +514,7 @@
     <Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventSource_CoreCLR.cs" />
     <Compile Condition="'$(FeatureXplatEventSource)' == 'true'" Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\XplatEventLogger.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\FrameworkEventSource.cs" />
-    <Compile Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipe.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipe.cs" />
     <Compile Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipeEventProvider.cs" />
   </ItemGroup>
   <ItemGroup>

From e642268970eab6302cea22d0a4cb358fa1f2706b Mon Sep 17 00:00:00 2001
From: Brian Robbins <brianrob@microsoft.com>
Date: Tue, 16 Jan 2018 15:24:54 -0800
Subject: [PATCH 2/3] Enable EventSource and EventPipe functional tests.

---
 tests/src/dirs.proj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index cb1c1b000d81..471598d82d7b 100644
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -30,8 +30,6 @@
       <DisabledProjects Include="Performance\performance.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
-      <DisabledProjects Include="tracing\eventsource*\*.csproj" />
-      <DisabledProjects Include="tracing\eventpipe*\*.csproj" />
     </ItemGroup>
     
     <ItemGroup>

From 9e25023669d6f046515a892c719774427a2013b0 Mon Sep 17 00:00:00 2001
From: Brian Robbins <brianrob@microsoft.com>
Date: Thu, 18 Jan 2018 12:16:00 -0800
Subject: [PATCH 3/3] Disable tests based on feedback.

---
 tests/issues.targets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/issues.targets b/tests/issues.targets
index 795369a0b3e8..5d6ff319d426 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -1726,6 +1726,17 @@
         <ExcludeList Include="$(XunitTestBinBase)\managed\Compilation\Compilation\Compilation.cmd">
             <Issue>needs triage</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\tracing\eventsourcetrace\*">
+            <Issue>15919</Issue>
+        </ExcludeList>
+    </ItemGroup>
+
+    <!-- The following are tests that fail on Windows -->
+
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TargetsWindows)' == 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)\tracing\eventsource*">
+            <Issue>15494</Issue>
+        </ExcludeList>
     </ItemGroup>
 
     <!-- Failures while testing via ILLINK -->