From e61d698bbc4fea470041587928baced1695bb3d1 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 10 Jun 2016 11:49:40 -0700 Subject: [PATCH] Remove NOETW in favor of LINUX ETW is available on Windows, so this is only (and will always be) necessary for Linux. --- src/Microsoft.PowerShell.CoreCLR.Eventing/project.json | 8 -------- src/System.Management.Automation/CoreCLR/CorePsStub.cs | 2 +- src/System.Management.Automation/logging/MshLog.cs | 2 +- src/System.Management.Automation/project.json | 2 +- .../utils/PowerShellETWTracer.cs | 2 +- .../utils/tracing/EtwActivity.cs | 2 +- .../utils/tracing/EtwActivityReverter.cs | 2 +- .../utils/tracing/EtwActivityReverterMethodInvoker.cs | 2 +- .../utils/tracing/EtwEventCorrelator.cs | 2 +- .../utils/tracing/IMethodInvoker.cs | 2 +- .../utils/tracing/PSEtwLog.cs | 2 +- .../utils/tracing/PSEtwLogProvider.cs | 2 +- src/System.Management.Automation/utils/tracing/Tracing.cs | 2 +- .../utils/tracing/TracingGen.cs | 2 +- 14 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json index 6a35f47c3d..2ff44c9ba1 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -9,14 +9,6 @@ "compile": [ "../windows-build/gen/Microsoft.PowerShell.CoreCLR.Eventing/*.cs" ] }, - "configurations": { - "Linux": { - "buildOptions": { - "define": [ "NOETW" ] - } - } - }, - "frameworks": { "netstandard1.5": { "imports": [ "dnxcore50" ], diff --git a/src/System.Management.Automation/CoreCLR/CorePsStub.cs b/src/System.Management.Automation/CoreCLR/CorePsStub.cs index 185cdc172b..ae56706546 100644 --- a/src/System.Management.Automation/CoreCLR/CorePsStub.cs +++ b/src/System.Management.Automation/CoreCLR/CorePsStub.cs @@ -1409,7 +1409,7 @@ namespace System.Management.Automation.Security } -#if NOETW || LINUX +#if LINUX // Porting note: Tracing is absolutely not available on Linux namespace System.Management.Automation.Tracing diff --git a/src/System.Management.Automation/logging/MshLog.cs b/src/System.Management.Automation/logging/MshLog.cs index e380c51a33..59ed23f051 100644 --- a/src/System.Management.Automation/logging/MshLog.cs +++ b/src/System.Management.Automation/logging/MshLog.cs @@ -172,7 +172,7 @@ namespace System.Management.Automation #endif Collection providers = new Collection(); // Porting note: Linux does not support ETW -#if !NOETW && !LINUX +#if !LINUX try { #if !CORECLR //TODO:CORECLR EventLogLogProvider not handled yet diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 5acef7e892..b5fd0b3425 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -12,7 +12,7 @@ "configurations": { "Linux": { "buildOptions": { - "define": [ "LINUX", "NOETW" ] + "define": [ "LINUX" ] } } }, diff --git a/src/System.Management.Automation/utils/PowerShellETWTracer.cs b/src/System.Management.Automation/utils/PowerShellETWTracer.cs index 7685073ba0..d9ec3d2df2 100644 --- a/src/System.Management.Automation/utils/PowerShellETWTracer.cs +++ b/src/System.Management.Automation/utils/PowerShellETWTracer.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX // // Copyright (C) Microsoft. All rights reserved. // diff --git a/src/System.Management.Automation/utils/tracing/EtwActivity.cs b/src/System.Management.Automation/utils/tracing/EtwActivity.cs index 19ed45d075..e7256d36e2 100644 --- a/src/System.Management.Automation/utils/tracing/EtwActivity.cs +++ b/src/System.Management.Automation/utils/tracing/EtwActivity.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX // // Copyright (C) Microsoft. All rights reserved. // diff --git a/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs b/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs index ec3b9d3852..30f6210409 100644 --- a/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs +++ b/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX //----------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs b/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs index 3cd849ea9a..8ccd2159fd 100644 --- a/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs +++ b/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX //----------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs b/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs index a8df80b9e2..8a2d546545 100644 --- a/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs +++ b/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX //----------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/src/System.Management.Automation/utils/tracing/IMethodInvoker.cs b/src/System.Management.Automation/utils/tracing/IMethodInvoker.cs index 980788273d..51c33a1d2f 100644 --- a/src/System.Management.Automation/utils/tracing/IMethodInvoker.cs +++ b/src/System.Management.Automation/utils/tracing/IMethodInvoker.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX //----------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLog.cs b/src/System.Management.Automation/utils/tracing/PSEtwLog.cs index c784b2975f..08ae05b4f3 100644 --- a/src/System.Management.Automation/utils/tracing/PSEtwLog.cs +++ b/src/System.Management.Automation/utils/tracing/PSEtwLog.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX // // Copyright (C) Microsoft. All rights reserved. // diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs index 2f8d206e29..4c04fe9630 100644 --- a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs +++ b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX // // Copyright (C) Microsoft. All rights reserved. // diff --git a/src/System.Management.Automation/utils/tracing/Tracing.cs b/src/System.Management.Automation/utils/tracing/Tracing.cs index eea3605add..ce69bb5d5b 100644 --- a/src/System.Management.Automation/utils/tracing/Tracing.cs +++ b/src/System.Management.Automation/utils/tracing/Tracing.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX // // Copyright (C) Microsoft. All rights reserved. // diff --git a/src/System.Management.Automation/utils/tracing/TracingGen.cs b/src/System.Management.Automation/utils/tracing/TracingGen.cs index 30564cff1f..e781bbffc1 100644 --- a/src/System.Management.Automation/utils/tracing/TracingGen.cs +++ b/src/System.Management.Automation/utils/tracing/TracingGen.cs @@ -1,4 +1,4 @@ -#if !NOETW +#if !LINUX using System; using System.Collections; using System.Diagnostics.Eventing;