Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 11:17:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[FxCop] Telemetry.csproj" (#6690)

Browse Source 
* Revert "marking all warnings (#6642)"

This reverts commit b0f0940534.

* Added warning comment
This commit is contained in:
Arjun Balgovind
2020-09-17 14:02:25 -07:00
committed by GitHub
parent b5cc24fcff
commit f19bad3761
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs
View File

@@ -14,8 +14,6 @@ namespace Microsoft.PowerToys.Telemetry.Events
[EventData] [EventData]
public class EventBase 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; public bool UTCReplace_AppSessionGuid => true;
private string _version; 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 // For consistency this should be formatted the same way as
// https://github.com/microsoft/PowerToys/blob/710f92d99965109fd788d85ebf8b6b9e0ba1524a/src/common/common.cpp#L635 // https://github.com/microsoft/PowerToys/blob/710f92d99965109fd788d85ebf8b6b9e0ba1524a/src/common/common.cpp#L635
var version = Assembly.GetExecutingAssembly()?.GetName()?.Version ?? new Version(); var version = Assembly.GetExecutingAssembly()?.GetName()?.Version ?? new Version();
return $"v{version.Major}.{version.Minor}.{version.Build}"; return $"v{version.Major}.{version.Minor}.{version.Build}";
} }
} }

1
src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
View File

@@ -6,7 +6,6 @@ namespace Microsoft.PowerToys.Telemetry.Events
{ {
public interface IEvent 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; } PartA_PrivTags PartA_PrivTags { get; }
} }
} }

6
src/common/ManagedTelemetry/Telemetry/Telemetry.csproj
View File

@@ -32,12 +32,6 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs"> <Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs">
<Link>GlobalSuppressions.cs</Link> <Link>GlobalSuppressions.cs</Link>

13
src/common/Telemetry/TelemetryBase.cs
View File

@@ -4,15 +4,12 @@
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
// WARNING: THIS FILE GETS REPLACED ON THE BUILD FARM
namespace Microsoft.PowerToys.Telemetry namespace Microsoft.PowerToys.Telemetry
{ {
/// <summary> /// <summary>
/// Privacy Tag values /// Privacy Tag values
/// </summary> /// </summary>
[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 public enum PartA_PrivTags
: ulong : ulong
{ {
@@ -50,8 +47,12 @@ namespace Microsoft.PowerToys.Telemetry
/// Initializes a new instance of the <see cref="TelemetryBase"/> class. /// Initializes a new instance of the <see cref="TelemetryBase"/> class.
/// </summary> /// </summary>
/// <param name="eventSourceName">.</param> /// <param name="eventSourceName">.</param>
public TelemetryBase(string eventSourceName) public TelemetryBase(
: base(eventSourceName, EventSourceSettings.EtwSelfDescribingEventFormat, PowerToysTelemetryTraits) string eventSourceName)
: base(
eventSourceName,
EventSourceSettings.EtwSelfDescribingEventFormat,
PowerToysTelemetryTraits)
{ {
return; return;
} }