From f19bad3761430570c40a05729fc1659d0b6dc6e3 Mon Sep 17 00:00:00 2001 From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com> Date: Thu, 17 Sep 2020 14:02:25 -0700 Subject: [PATCH] Revert "[FxCop] Telemetry.csproj" (#6690) * Revert "marking all warnings (#6642)" This reverts commit b0f09405341f8315ee22ec1a5d1bea0a1f581b9c. * Added warning comment --- .../ManagedTelemetry/Telemetry/Events/EventBase.cs | 5 +---- .../ManagedTelemetry/Telemetry/Events/IEvent.cs | 1 - .../ManagedTelemetry/Telemetry/Telemetry.csproj | 6 ------ src/common/Telemetry/TelemetryBase.cs | 13 +++++++------ 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs b/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs index 96865ee9bb..ba1a43f3c8 100644 --- a/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs +++ b/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs @@ -14,8 +14,6 @@ namespace Microsoft.PowerToys.Telemetry.Events [EventData] public class EventBase { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Part of telem, can't adjust")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of telem, can't adjust")] public bool UTCReplace_AppSessionGuid => true; private string _version; @@ -33,12 +31,11 @@ namespace Microsoft.PowerToys.Telemetry.Events } } - private static string GetVersionFromAssembly() + private string GetVersionFromAssembly() { // For consistency this should be formatted the same way as // https://github.com/microsoft/PowerToys/blob/710f92d99965109fd788d85ebf8b6b9e0ba1524a/src/common/common.cpp#L635 var version = Assembly.GetExecutingAssembly()?.GetName()?.Version ?? new Version(); - return $"v{version.Major}.{version.Minor}.{version.Build}"; } } diff --git a/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs b/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs index 66dceaeade..280272b06b 100644 --- a/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs +++ b/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs @@ -6,7 +6,6 @@ namespace Microsoft.PowerToys.Telemetry.Events { public interface IEvent { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Part of telem, can't adjust")] PartA_PrivTags PartA_PrivTags { get; } } } diff --git a/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj b/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj index 4727af320f..eb222a5315 100644 --- a/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj +++ b/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj @@ -32,12 +32,6 @@ all - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - GlobalSuppressions.cs diff --git a/src/common/Telemetry/TelemetryBase.cs b/src/common/Telemetry/TelemetryBase.cs index 2a63d4b7d6..594218bbe8 100644 --- a/src/common/Telemetry/TelemetryBase.cs +++ b/src/common/Telemetry/TelemetryBase.cs @@ -4,15 +4,12 @@ using System.Diagnostics.Tracing; +// WARNING: THIS FILE GETS REPLACED ON THE BUILD FARM namespace Microsoft.PowerToys.Telemetry { /// /// Privacy Tag values /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1028:Enum Storage should be Int32", Justification = "Part of telem, can't adjust")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1069:Enums values should not be duplicated", Justification = "Part of telem, gets overwritten by build farm")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Part of telem, can't adjust")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names", Justification = "Part of telem, can't adjust")] public enum PartA_PrivTags : ulong { @@ -50,8 +47,12 @@ namespace Microsoft.PowerToys.Telemetry /// Initializes a new instance of the class. /// /// . - public TelemetryBase(string eventSourceName) - : base(eventSourceName, EventSourceSettings.EtwSelfDescribingEventFormat, PowerToysTelemetryTraits) + public TelemetryBase( + string eventSourceName) + : base( + eventSourceName, + EventSourceSettings.EtwSelfDescribingEventFormat, + PowerToysTelemetryTraits) { return; }