diff --git a/tests/issues.targets b/tests/issues.targets
index 49494d21bd52..8c74e72a035a 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -187,9 +187,6 @@
6707
-
- 15919
-
@@ -1728,7 +1725,7 @@
-
+
15494
diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index daa39d658f65..6bb138b70624 100644
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -31,7 +31,6 @@
-
diff --git a/tests/src/tracing/eventsourcesmoke/EventSourceSmoke.cs b/tests/src/tracing/eventsourcesmoke/EventSourceSmoke.cs
deleted file mode 100644
index f0873bcc37d0..000000000000
--- a/tests/src/tracing/eventsourcesmoke/EventSourceSmoke.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.IO;
-using System.Diagnostics.Tracing;
-using Tracing.Tests.Common;
-
-namespace Tracing.Tests
-{
- [EventSource(Name = "SimpleEventSource")]
- class SimpleEventSource : EventSource
- {
- public SimpleEventSource() : base(true) { }
-
- [Event(1)]
- internal void MathResult(int x, int y, int z, string formula) { this.WriteEvent(1, x, y, z, formula); }
- }
-
- class EventPipeSmoke
- {
- private static int messageIterations = 10000;
- private static int trivialSize = 0x100000;
-
- public static TraceConfiguration GetConfig(EventSource eventSource, string outputFile="default.netperf")
- {
- // Setup the configuration values.
- uint circularBufferMB = 1024; // 1 GB
- uint level = 5;//(uint)EventLevel.Informational;
- TimeSpan profSampleDelay = TimeSpan.FromMilliseconds(1);
-
- // Create a new instance of EventPipeConfiguration.
- TraceConfiguration config = new TraceConfiguration(outputFile, circularBufferMB);
- // Setup the provider values.
- // Public provider.
- string providerName = eventSource.Name;
- UInt64 keywords = 0xffffffffffffffff;
-
- // Enable the provider.
- config.EnableProvider(providerName, keywords, level);
-
- // Set the sampling rate.
- config.SetSamplingRate(profSampleDelay);
-
- return config;
- }
-
- static int Main(string[] args)
- {
- using (var netPerfFile = NetPerfFile.Create(args))
- {
- SimpleEventSource eventSource = new SimpleEventSource();
-
- Console.WriteLine("\tStart: Enable tracing.");
- TraceControl.Enable(GetConfig(eventSource, netPerfFile.Path));
- Console.WriteLine("\tEnd: Enable tracing.\n");
-
- Console.WriteLine("\tStart: Messaging.");
- // Send messages
- // Use random numbers and addition as a simple, human readble checksum
- Random generator = new Random();
- for (int i = 0; i < messageIterations; i++)
- {
- int x = generator.Next(1, 1000);
- int y = generator.Next(1, 1000);
- string formula = String.Format("{0} + {1} = {2}", x, y, x + y);
-
- eventSource.MathResult(x, y, x + y, formula);
- }
- Console.WriteLine("\tEnd: Messaging.\n");
-
- Console.WriteLine("\tStart: Disable tracing.");
- TraceControl.Disable();
- Console.WriteLine("\tEnd: Disable tracing.\n");
-
- FileInfo outputMeta = new FileInfo(netPerfFile.Path);
- Console.WriteLine("\tCreated {0} bytes of data", outputMeta.Length);
-
- return outputMeta.Length > trivialSize ? 100 : -1;
- }
- }
- }
-}
diff --git a/tests/src/tracing/eventsourcesmoke/eventsourcesmoke.csproj b/tests/src/tracing/eventsourcesmoke/eventsourcesmoke.csproj
deleted file mode 100644
index a617c6657a19..000000000000
--- a/tests/src/tracing/eventsourcesmoke/eventsourcesmoke.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- 2.0
- {8E3244CB-407F-4142-BAAB-E7A55901A5FA}
- Exe
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- ..\..\
- BuildAndRun
- $(DefineConstants);STATIC
- true
- 1
-
-
-
-
-
-
-
-
- False
-
-
-
-
-
-
-
-
diff --git a/tests/src/tracing/eventsourcetrace/EventSourceTrace.cs b/tests/src/tracing/eventsourcetrace/EventSourceTrace.cs
index 2fbaad15bcea..3c9135927c41 100644
--- a/tests/src/tracing/eventsourcetrace/EventSourceTrace.cs
+++ b/tests/src/tracing/eventsourcetrace/EventSourceTrace.cs
@@ -4,6 +4,7 @@
using Tracing.Tests.Common;
using System.Diagnostics.Tracing;
using Microsoft.Diagnostics.Tracing;
+using Microsoft.Diagnostics.Tracing.Etlx;
using Microsoft.Diagnostics.Tracing.Parsers;
using Microsoft.Diagnostics.Tracing.Parsers.Clr;
@@ -77,7 +78,7 @@ static int Main(string[] args)
Console.WriteLine("\tStart: Processing events from file.");
int msgCount = 0;
- using (var trace = TraceEventDispatcher.GetDispatcherFromFileName(netPerfFile.Path))
+ using (var trace = new TraceLog(TraceLog.CreateFromEventPipeDataFile(netPerfFile.Path)).Events.GetSource())
{
var names = new HashSet();
diff --git a/tests/src/tracing/eventsourcetrace/eventsourcetrace.csproj b/tests/src/tracing/eventsourcetrace/eventsourcetrace.csproj
index 833146ec6437..0bf6d8fd3939 100644
--- a/tests/src/tracing/eventsourcetrace/eventsourcetrace.csproj
+++ b/tests/src/tracing/eventsourcetrace/eventsourcetrace.csproj
@@ -12,7 +12,7 @@
BuildAndRun
$(DefineConstants);STATIC
true
- 1
+ 0