diff --git a/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs b/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs index ba1a43f3c8..96865ee9bb 100644 --- a/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs +++ b/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs @@ -14,6 +14,8 @@ 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; @@ -31,11 +33,12 @@ namespace Microsoft.PowerToys.Telemetry.Events } } - private string GetVersionFromAssembly() + private static 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 280272b06b..66dceaeade 100644 --- a/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs +++ b/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs @@ -6,6 +6,7 @@ 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 eb222a5315..4727af320f 100644 --- a/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj +++ b/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj @@ -32,6 +32,12 @@ 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 a7cfb8310c..2a63d4b7d6 100644 --- a/src/common/Telemetry/TelemetryBase.cs +++ b/src/common/Telemetry/TelemetryBase.cs @@ -9,6 +9,10 @@ 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 { @@ -46,12 +50,8 @@ 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; }