[dotnet-trace] Update namespaces based on previous PR feedback. (#145)

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/DiagnosticMessageType.cs b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/DiagnosticMessageType.cs
index aae781108cffe3bfb634dc7e253c871e03df144d..3668f9482e41c0fb2c59a177dea70e79423a0052 100644 (file)
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/DiagnosticMessageType.cs
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/DiagnosticMessageType.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Diagnostics.Tools.RuntimeClient.Eventing
+namespace Microsoft.Diagnostics.Tools.RuntimeClient
 {
     enum DiagnosticMessageType : uint
     {

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/EventPipeClient.cs b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/EventPipeClient.cs
index 636259fc4c6288bcb19ab061610c66f2337fd8df..11693824d13eb5fe1514008c21194816c43b4212 100644 (file)
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/EventPipeClient.cs
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/EventPipeClient.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.Diagnostics.Tools.RuntimeClient.Eventing
+namespace Microsoft.Diagnostics.Tools.RuntimeClient
 {
     public static class EventPipeClient
     {

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/MessageHeader.cs b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/MessageHeader.cs
index 14ab6e630179139ab36a110bdff5aab90a2d57be..bcfc9e94c8b2d3e754c2183986eab06fd42d7efc 100644 (file)
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/MessageHeader.cs
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/MessageHeader.cs
@@ -4,7 +4,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Microsoft.Diagnostics.Tools.RuntimeClient.Eventing
+namespace Microsoft.Diagnostics.Tools.RuntimeClient
 {
     [StructLayout(LayoutKind.Sequential)]
     struct MessageHeader

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/Provider.cs b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/Provider.cs
index 8995a8c3249a1b2642d9f8e3d76a724be8cf941a..2738735e508381a0aaf84f6d9c249ba89367ad0c 100644 (file)
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/Provider.cs
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/Provider.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Diagnostics.Tracing;
 
-namespace Microsoft.Diagnostics.Tools.RuntimeClient.Eventing
+namespace Microsoft.Diagnostics.Tools.RuntimeClient
 {
     public struct Provider
     {

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/SessionConfiguration.cs b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/SessionConfiguration.cs
index ad7c3295ea9e55e530dfdc20ec09e2798fed61b3..3950f1ba6c1cc0c240867533a26f74d061c04424 100644 (file)
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/SessionConfiguration.cs
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Eventing/SessionConfiguration.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Microsoft.Diagnostics.Tools.RuntimeClient.Eventing
+namespace Microsoft.Diagnostics.Tools.RuntimeClient
 {
     public struct SessionConfiguration
     {

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Extensions.cs b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Extensions.cs
index 4f581ec35dff48fcefed5ba70f06c0d8ee2df5d0..266e717dc1e338ac951fcd2e72514e324530669e 100644 (file)
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Extensions.cs
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Extensions.cs
@@ -1,6 +1,8 @@
-using Microsoft.Diagnostics.Tools.RuntimeClient.Eventing;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;

diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/PortsCommandHandler.cs b/src/Tools/dotnet-trace/CommandLine/Commands/PortsCommandHandler.cs
index b8d5bd072aeb42616b119449320ab582ca202c27..49b89e0d4eee5565a6ed1cdbecf932e04edff5d8 100644 (file)
--- a/src/Tools/dotnet-trace/CommandLine/Commands/PortsCommandHandler.cs
+++ b/src/Tools/dotnet-trace/CommandLine/Commands/PortsCommandHandler.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Tools.RuntimeClient.Eventing;
+using Microsoft.Diagnostics.Tools.RuntimeClient;
 using System;
 using System.CommandLine;
 using System.CommandLine.Invocation;

diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/ProvidersCommandHandler.cs b/src/Tools/dotnet-trace/CommandLine/Commands/ProvidersCommandHandler.cs
index c48d3c08df677f5d1a247607ff8ce9509796fa39..2a5ce5e6eeea562cf88b8a7e7bf44f82578a94b1 100644 (file)
--- a/src/Tools/dotnet-trace/CommandLine/Commands/ProvidersCommandHandler.cs
+++ b/src/Tools/dotnet-trace/CommandLine/Commands/ProvidersCommandHandler.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Tools.RuntimeClient.Eventing;
+using Microsoft.Diagnostics.Tools.RuntimeClient;
 using System;
 using System.Collections.Generic;
 using System.CommandLine;

diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/StartCommandHandler.cs b/src/Tools/dotnet-trace/CommandLine/Commands/StartCommandHandler.cs
index 22ae309b251ec2feb1714a75d1fa913b037c20eb..627c5179b5e5726eb2c9737438a0135192659521 100644 (file)
--- a/src/Tools/dotnet-trace/CommandLine/Commands/StartCommandHandler.cs
+++ b/src/Tools/dotnet-trace/CommandLine/Commands/StartCommandHandler.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Tools.RuntimeClient.Eventing;
+using Microsoft.Diagnostics.Tools.RuntimeClient;
 using System;
 using System.Collections.Generic;
 using System.CommandLine;

diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/StopCommandHandler.cs b/src/Tools/dotnet-trace/CommandLine/Commands/StopCommandHandler.cs
index 230e9fcedea0dd5baab525d545e16c0569253c65..e7bde9b3568eb1a95a187f99398d2835c6532c0d 100644 (file)
--- a/src/Tools/dotnet-trace/CommandLine/Commands/StopCommandHandler.cs
+++ b/src/Tools/dotnet-trace/CommandLine/Commands/StopCommandHandler.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Tools.RuntimeClient.Eventing;
+using Microsoft.Diagnostics.Tools.RuntimeClient;
 using System;
 using System.CommandLine;
 using System.CommandLine.Invocation;

diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/StreamCommand.cs b/src/Tools/dotnet-trace/CommandLine/Commands/StreamCommand.cs
index d673195c90522e915d9fea6bea5bd53ec9a1e996..5f10ea65dc39e108d02ecdb251aa7e9696eaa8fe 100644 (file)
--- a/src/Tools/dotnet-trace/CommandLine/Commands/StreamCommand.cs
+++ b/src/Tools/dotnet-trace/CommandLine/Commands/StreamCommand.cs
@@ -1,4 +1,8 @@
-using Microsoft.Diagnostics.Tools.RuntimeClient.Eventing;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Diagnostics.Tools.RuntimeClient;
 using System;
 using System.Collections.Generic;
 using System.CommandLine;
@@ -26,7 +30,6 @@ namespace Microsoft.Diagnostics.Tools.Trace
                 if (sessionId != 0)
                 {
                     var filePath = $"dotnetcore-eventpipe-{pid}-0x{sessionId:X16}.netperf";
-                    filePath = Path.Combine(@"S:\github.com\jorive\diagnostics\src\Tools\dotnet-trace", filePath);
                     using (var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write))
                     {
                         while (true)