Skip to content

Commit e3250fa

Browse files
davidegiacomettidavidegiacometti
authored
Update StyleCop (#2162)
1 parent 213913e commit e3250fa

File tree

205 files changed

+786
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+786
-732
lines changed

‎CoreWidgetProvider/Helpers/CPUStats.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ namespace CoreWidgetProvider.Helpers;
88
internal sealed class CPUStats : IDisposable
99
{
1010
// CPU counters
11-
private readonly PerformanceCounter procPerf = new ("Processor Information", "% Processor Utility", "_Total");
12-
private readonly PerformanceCounter procPerformance = new ("Processor Information", "% Processor Performance", "_Total");
13-
private readonly PerformanceCounter procFrequency = new ("Processor Information", "Processor Frequency", "_Total");
14-
private readonly Dictionary<Process, PerformanceCounter> cpuCounters = new ();
11+
private readonly PerformanceCounter procPerf = new("Processor Information", "% Processor Utility", "_Total");
12+
private readonly PerformanceCounter procPerformance = new("Processor Information", "% Processor Performance", "_Total");
13+
private readonly PerformanceCounter procFrequency = new("Processor Information", "Processor Frequency", "_Total");
14+
private readonly Dictionary<Process, PerformanceCounter> cpuCounters = new();
1515

1616
internal sealed class ProcessStats
1717
{

‎CoreWidgetProvider/Helpers/GPUStats.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation.
1+
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

44
using System.Diagnostics;
@@ -10,9 +10,9 @@ namespace CoreWidgetProvider.Helpers;
1010
internal sealed class GPUStats : IDisposable
1111
{
1212
// GPU counters
13-
private readonly Dictionary<int, List<PerformanceCounter>> gpuCounters = new ();
13+
private readonly Dictionary<int, List<PerformanceCounter>> gpuCounters = new();
1414

15-
private readonly List<Data> stats = new ();
15+
private readonly List<Data> stats = new();
1616

1717
public sealed class Data
1818
{
@@ -81,7 +81,7 @@ public void GetGPUPerfCounters()
8181

8282
if (!gpuCounters.TryGetValue(phys, out var value))
8383
{
84-
value = new ();
84+
value = new();
8585
gpuCounters.Add(phys, value);
8686
}
8787

‎CoreWidgetProvider/Helpers/IconLoader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CoreWidgetProvider.Helpers;
55

66
public class IconLoader
77
{
8-
private static readonly Dictionary<string, string> Base64ImageRegistry = new ();
8+
private static readonly Dictionary<string, string> Base64ImageRegistry = new();
99

1010
public static string GetIconAsBase64(string filename)
1111
{

‎CoreWidgetProvider/Helpers/Log.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace CoreWidgetProvider.Helpers;
99

1010
public class Log
1111
{
12-
private static readonly ComponentLogger _logger = new ("CoreWidgetProvider");
12+
private static readonly ComponentLogger _logger = new("CoreWidgetProvider");
1313

1414
public static Logger? Logger() => _logger.Logger;
1515
}

‎CoreWidgetProvider/Helpers/MemoryStats.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ namespace CoreWidgetProvider.Helpers;
99

1010
internal sealed class MemoryStats : IDisposable
1111
{
12-
private readonly PerformanceCounter memCommitted = new ("Memory", "Committed Bytes", string.Empty);
13-
private readonly PerformanceCounter memCached = new ("Memory", "Cache Bytes", string.Empty);
14-
private readonly PerformanceCounter memCommittedLimit = new ("Memory", "Commit Limit", string.Empty);
15-
private readonly PerformanceCounter memPoolPaged = new ("Memory", "Pool Paged Bytes", string.Empty);
16-
private readonly PerformanceCounter memPoolNonPaged = new ("Memory", "Pool Nonpaged Bytes", string.Empty);
12+
private readonly PerformanceCounter memCommitted = new("Memory", "Committed Bytes", string.Empty);
13+
private readonly PerformanceCounter memCached = new("Memory", "Cache Bytes", string.Empty);
14+
private readonly PerformanceCounter memCommittedLimit = new("Memory", "Commit Limit", string.Empty);
15+
private readonly PerformanceCounter memPoolPaged = new("Memory", "Pool Paged Bytes", string.Empty);
16+
private readonly PerformanceCounter memPoolNonPaged = new("Memory", "Pool Nonpaged Bytes", string.Empty);
1717

1818
public float MemUsage
1919
{
@@ -59,7 +59,7 @@ public ulong MemNonPagedPool
5959

6060
public void GetData()
6161
{
62-
Windows.Win32.System.SystemInformation.MEMORYSTATUSEX memStatus = new ();
62+
Windows.Win32.System.SystemInformation.MEMORYSTATUSEX memStatus = default;
6363
memStatus.dwLength = (uint)Marshal.SizeOf(typeof(Windows.Win32.System.SystemInformation.MEMORYSTATUSEX));
6464
if (PInvoke.GlobalMemoryStatusEx(out memStatus))
6565
{

‎CoreWidgetProvider/Helpers/NetworkStats.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace CoreWidgetProvider.Helpers;
77

88
internal sealed class NetworkStats : IDisposable
99
{
10-
private readonly Dictionary<string, List<PerformanceCounter>> networkCounters = new ();
10+
private readonly Dictionary<string, List<PerformanceCounter>> networkCounters = new();
1111

1212
private Dictionary<string, Data> NetworkUsages { get; set; } = new Dictionary<string, Data>();
1313

‎CoreWidgetProvider/Helpers/Resources.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.Windows.ApplicationModel.Resources;
66

77
namespace CoreWidgetProvider.Helpers;
8+
89
public static class Resources
910
{
1011
private static ResourceLoader? _resourceLoader;

‎CoreWidgetProvider/Program.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Windows.ApplicationModel.Activation;
77

88
namespace CoreWidgetProvider;
9+
910
public sealed class Program
1011
{
1112
[MTAThread]

‎CoreWidgetProvider/FactoryHelper.cs ‎CoreWidgetProvider/WidgetProviderFactory`1.cs

+20-20
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,6 @@
77

88
namespace COM;
99

10-
internal static class Guids
11-
{
12-
public const string IClassFactory = "00000001-0000-0000-C000-000000000046";
13-
public const string IUnknown = "00000000-0000-0000-C000-000000000046";
14-
}
15-
16-
// IClassFactory declaration
17-
[ComImport]
18-
[ComVisible(false)]
19-
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
20-
[Guid(COM.Guids.IClassFactory)]
21-
internal interface IClassFactory
22-
{
23-
[PreserveSig]
24-
int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject);
25-
26-
[PreserveSig]
27-
int LockServer(bool fLock);
28-
}
29-
3010
[ComVisible(true)]
3111
public class WidgetProviderFactory<T> : IClassFactory
3212
where T : IWidgetProvider
@@ -70,3 +50,23 @@ int IClassFactory.LockServer(bool fLock)
7050
private const int CLASSENOAGGREGATION = unchecked((int)0x80040110);
7151
private const int ENOINTERFACE = unchecked((int)0x80004002);
7252
}
53+
54+
internal static class Guids
55+
{
56+
public const string IClassFactory = "00000001-0000-0000-C000-000000000046";
57+
public const string IUnknown = "00000000-0000-0000-C000-000000000046";
58+
}
59+
60+
// IClassFactory declaration
61+
[ComImport]
62+
[ComVisible(false)]
63+
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
64+
[Guid(COM.Guids.IClassFactory)]
65+
internal interface IClassFactory
66+
{
67+
[PreserveSig]
68+
int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject);
69+
70+
[PreserveSig]
71+
int LockServer(bool fLock);
72+
}

‎CoreWidgetProvider/Widgets/CoreWidget.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected bool Enabled
2828
get; set;
2929
}
3030

31-
protected Dictionary<WidgetPageState, string> Template { get; set; } = new ();
31+
protected Dictionary<WidgetPageState, string> Template { get; set; } = new();
3232

3333
public CoreWidget()
3434
{
@@ -102,7 +102,7 @@ public virtual void UpdateWidget()
102102
{
103103
LoadContentData();
104104

105-
WidgetUpdateRequestOptions updateOptions = new (Id)
105+
WidgetUpdateRequestOptions updateOptions = new(Id)
106106
{
107107
Data = GetData(Page),
108108
Template = GetTemplateForPage(Page),

‎CoreWidgetProvider/Widgets/Enums/WidgetActivityState.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33

44
namespace CoreWidgetProvider.Widgets.Enums;
5+
56
public enum WidgetActivityState
67
{
78
/// <summary>

‎CoreWidgetProvider/Widgets/Enums/WidgetDataState.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33

44
namespace CoreWidgetProvider.Widgets.Enums;
5+
56
public enum WidgetDataState
67
{
78
Unknown,

‎CoreWidgetProvider/Widgets/Enums/WidgetPageState.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33

44
namespace CoreWidgetProvider.Widgets.Enums;
5+
56
public enum WidgetPageState
67
{
78
Unknown,

‎CoreWidgetProvider/Widgets/IWidgetImplFactory.cs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.Windows.Widgets.Providers;
55

66
namespace CoreWidgetProvider.Widgets;
7+
78
internal interface IWidgetImplFactory
89
{
910
public WidgetImpl Create(WidgetContext widgetContext, string state);

‎CoreWidgetProvider/Widgets/SSHWalletWidget.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal sealed class SSHWalletWidget : CoreWidget
1717
{
1818
private static readonly string DefaultConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\.ssh\\config";
1919

20-
private static readonly Regex HostRegex = new (@"^Host\s+(\S*)\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline);
20+
private static readonly Regex HostRegex = new(@"^Host\s+(\S*)\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline);
2121

2222
private FileSystemWatcher? FileWatcher { get; set; }
2323

@@ -212,7 +212,7 @@ private void SetupFileWatcher()
212212
var configFileDir = Path.GetDirectoryName(ConfigFile);
213213
var configFileName = Path.GetFileName(ConfigFile);
214214

215-
if (configFileDir != null && configFileName != null )
215+
if (configFileDir != null && configFileName != null)
216216
{
217217
FileWatcher = new FileSystemWatcher(configFileDir, configFileName);
218218

@@ -341,7 +341,7 @@ public override void UpdateActivityState()
341341

342342
public override void UpdateWidget()
343343
{
344-
WidgetUpdateRequestOptions updateOptions = new (Id)
344+
WidgetUpdateRequestOptions updateOptions = new(Id)
345345
{
346346
Data = GetData(Page),
347347
Template = GetTemplateForPage(Page),

‎CoreWidgetProvider/Widgets/SystemCPUUsageWidget.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
using Microsoft.Windows.Widgets.Providers;
99

1010
namespace CoreWidgetProvider.Widgets;
11+
1112
internal sealed class SystemCPUUsageWidget : CoreWidget, IDisposable
1213
{
13-
private static Dictionary<string, string> Templates { get; set; } = new ();
14+
private static Dictionary<string, string> Templates { get; set; } = new();
1415

1516
private static readonly new string Name = nameof(SystemCPUUsageWidget);
1617

@@ -19,7 +20,7 @@ internal sealed class SystemCPUUsageWidget : CoreWidget, IDisposable
1920
public SystemCPUUsageWidget()
2021
: base()
2122
{
22-
dataManager = new (DataType.CPU, UpdateWidget);
23+
dataManager = new(DataType.CPU, UpdateWidget);
2324
}
2425

2526
private string SpeedToString(float cpuSpeed)

‎CoreWidgetProvider/Widgets/SystemGPUUsageWidget.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

4-
using System.Diagnostics;
54
using System.Globalization;
65
using System.Text.Json.Nodes;
76
using CoreWidgetProvider.Helpers;
87
using CoreWidgetProvider.Widgets.Enums;
98
using Microsoft.Windows.Widgets.Providers;
109

1110
namespace CoreWidgetProvider.Widgets;
11+
1212
internal sealed class SystemGPUUsageWidget : CoreWidget, IDisposable
1313
{
14-
private static Dictionary<string, string> Templates { get; set; } = new ();
14+
private static Dictionary<string, string> Templates { get; set; } = new();
1515

1616
private static readonly new string Name = nameof(SystemGPUUsageWidget);
1717

@@ -24,7 +24,7 @@ internal sealed class SystemGPUUsageWidget : CoreWidget, IDisposable
2424
public SystemGPUUsageWidget()
2525
: base()
2626
{
27-
dataManager = new (DataType.GPU, UpdateWidget);
27+
dataManager = new(DataType.GPU, UpdateWidget);
2828
}
2929

3030
private string SpeedToString(float cpuSpeed)

‎CoreWidgetProvider/Widgets/SystemMemoryWidget.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace CoreWidgetProvider.Widgets;
1010

1111
internal sealed class SystemMemoryWidget : CoreWidget, IDisposable
1212
{
13-
private static Dictionary<string, string> Templates { get; set; } = new ();
13+
private static Dictionary<string, string> Templates { get; set; } = new();
1414

1515
private static readonly new string Name = nameof(SystemMemoryWidget);
1616

@@ -19,7 +19,7 @@ internal sealed class SystemMemoryWidget : CoreWidget, IDisposable
1919
public SystemMemoryWidget()
2020
: base()
2121
{
22-
dataManager = new (DataType.Memory, UpdateWidget);
22+
dataManager = new(DataType.Memory, UpdateWidget);
2323
}
2424

2525
private string FloatToPercentString(float value)

‎CoreWidgetProvider/Widgets/SystemNetworkUsageWidget.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
using Microsoft.Windows.Widgets.Providers;
99

1010
namespace CoreWidgetProvider.Widgets;
11+
1112
internal sealed class SystemNetworkUsageWidget : CoreWidget, IDisposable
1213
{
13-
private static Dictionary<string, string> Templates { get; set; } = new ();
14+
private static Dictionary<string, string> Templates { get; set; } = new();
1415

1516
private int networkIndex;
1617

@@ -21,7 +22,7 @@ internal sealed class SystemNetworkUsageWidget : CoreWidget, IDisposable
2122
public SystemNetworkUsageWidget()
2223
: base()
2324
{
24-
dataManager = new (DataType.Network, UpdateWidget);
25+
dataManager = new(DataType.Network, UpdateWidget);
2526
}
2627

2728
private string SpeedToString(float cpuSpeed)

‎CoreWidgetProvider/Widgets/WidgetImpl.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Windows.Widgets.Providers;
77

88
namespace CoreWidgetProvider.Widgets;
9+
910
public abstract class WidgetImpl
1011
{
1112
#pragma warning disable SA1310 // Field names should not contain underscore

‎CoreWidgetProvider/Widgets/WidgetImplFactory.cs ‎CoreWidgetProvider/Widgets/WidgetImplFactory`1.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.Windows.Widgets.Providers;
66

77
namespace CoreWidgetProvider.Widgets;
8+
89
internal sealed class WidgetImplFactory<T> : IWidgetImplFactory
910
where T : WidgetImpl, new()
1011
{

‎CoreWidgetProvider/Widgets/WidgetProvider.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace CoreWidgetProvider.Widgets;
1212
[Guid("F8B2DBB9-3687-4C6E-99B2-B92C82905937")]
1313
internal sealed class WidgetProvider : IWidgetProvider, IWidgetProvider2
1414
{
15-
private readonly Dictionary<string, IWidgetImplFactory> widgetDefinitionRegistry = new ();
16-
private readonly Dictionary<string, WidgetImpl> runningWidgets = new ();
15+
private readonly Dictionary<string, IWidgetImplFactory> widgetDefinitionRegistry = new();
16+
private readonly Dictionary<string, WidgetImpl> runningWidgets = new();
1717

1818
public WidgetProvider()
1919
{

‎CoreWidgetProvider/Widgets/WidgetServer.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
using Windows.Win32.System.Com;
1212

1313
namespace CoreWidgetProvider.Widgets;
14+
1415
public sealed class WidgetServer : IDisposable
1516
{
16-
private readonly HashSet<uint> registrationCookies = new ();
17+
private readonly HashSet<uint> registrationCookies = new();
1718

1819
[UnconditionalSuppressMessage(
1920
"ReflectionAnalysis",

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</PropertyGroup>
3131

3232
<ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
33-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
33+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>

0 commit comments

Comments
 (0)