Revert "[Dev][Build] .NET 8 Upgrade (#1968)"

This reverts commit 2f2ba18.
microsoft · Jan 19, 2024 · 2a3c27e · 2a3c27e
1 parent 4c3ff6b
commit 2a3c27e
Show file tree

Hide file tree

Showing 109 changed files with 246 additions and 253 deletions.
diff --git a/.github/workflows/DevHome-CI.yml b/.github/workflows/DevHome-CI.yml
@@ -15,7 +15,7 @@ jobs:
         configuration: [Release, Debug]
         platform: [x64, x86, arm64]
         os: [windows-latest]
-        dotnet-version: ['8.0.x']
+        dotnet-version: ['6.0.x']
         exclude:
         - configuration: Debug
           platform: x64
@@ -77,11 +77,11 @@ jobs:
 
     - name: DevHome UnitTests
       if: ${{ matrix.platform != 'arm64' }}
-      run: cmd /c "$env:VSDevTestCmd" /Platform:${{ matrix.platform }} test\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net8.0-windows10.0.22000.0\\DevHome.Test.dll
+      run: cmd /c "$env:VSDevTestCmd" /Platform:${{ matrix.platform }} test\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net6.0-windows10.0.22000.0\\DevHome.Test.dll
 
     - name: Tools UnitTests
       if: ${{ matrix.platform != 'arm64' }}
       run: |
-        foreach ($UnitTestPath in (Get-ChildItem "tools\\*\\*UnitTest\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net8.0-windows10.0.22000.0\\*.UnitTest.dll")) {
+        foreach ($UnitTestPath in (Get-ChildItem "tools\\*\\*UnitTest\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net6.0-windows10.0.22000.0\\*.UnitTest.dll")) {
           cmd /c "$env:VSDevTestCmd" /Platform:${{ matrix.platform }} $UnitTestPath.FullName
         }
diff --git a/CoreWidgetProvider/CoreWidgetProvider.csproj b/CoreWidgetProvider/CoreWidgetProvider.csproj
@@ -12,16 +12,16 @@
     <Nullable>enable</Nullable>
     <CsWinRTEnabled>false</CsWinRTEnabled>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <PublishProfileFullPath Condition="'$(BuildingInsideVisualStudio)' != 'True'">$(SolutionDir)\src\Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfileFullPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CoreWidgetProvider/Helpers/CPUStats.cs b/CoreWidgetProvider/Helpers/CPUStats.cs
@@ -5,15 +5,15 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class CPUStats : IDisposable
+internal class CPUStats : IDisposable
 {
     // CPU counters
     private readonly PerformanceCounter procPerf = new ("Processor Information", "% Processor Utility", "_Total");
     private readonly PerformanceCounter procPerformance = new ("Processor Information", "% Processor Performance", "_Total");
     private readonly PerformanceCounter procFrequency = new ("Processor Information", "Processor Frequency", "_Total");
     private readonly Dictionary<Process, PerformanceCounter> cpuCounters = new ();
 
-    internal sealed class ProcessStats
+    internal class ProcessStats
     {
         public Process? Process { get; set; }
 
@@ -31,12 +31,7 @@ internal sealed class ProcessStats
     public CPUStats()
     {
         CpuUsage = 0;
-        ProcessCPUStats =
-        [
-            new ProcessStats(),
-            new ProcessStats(),
-            new ProcessStats()
-        ];
+        ProcessCPUStats = new ProcessStats[3] { new ProcessStats(), new ProcessStats(), new ProcessStats() };
 
         InitCPUPerfCounters();
     }

diff --git a/CoreWidgetProvider/Helpers/ChartHelper.cs b/CoreWidgetProvider/Helpers/ChartHelper.cs
@@ -7,7 +7,7 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class ChartHelper
+internal class ChartHelper
 {
     public enum ChartType
     {

diff --git a/CoreWidgetProvider/Helpers/DataManager.cs b/CoreWidgetProvider/Helpers/DataManager.cs
@@ -5,7 +5,7 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class DataManager : IDisposable
+internal class DataManager : IDisposable
 {
     private readonly SystemData systemData;
     private readonly DataType dataType;

diff --git a/CoreWidgetProvider/Helpers/GPUStats.cs b/CoreWidgetProvider/Helpers/GPUStats.cs
@@ -7,14 +7,14 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class GPUStats : IDisposable
+internal class GPUStats : IDisposable
 {
     // GPU counters
     private readonly Dictionary<int, List<PerformanceCounter>> gpuCounters = new ();
 
     private readonly List<Data> stats = new ();
 
-    public sealed class Data
+    public class Data
     {
         public string? Name { get; set; }
 
@@ -79,13 +79,12 @@ public void GetGPUPerfCounters()
                         continue;
                     }
 
-                    if (!gpuCounters.TryGetValue(phys, out var value))
+                    if (!gpuCounters.ContainsKey(phys))
                     {
-                        value = new ();
-                        gpuCounters.Add(phys, value);
+                        gpuCounters.Add(phys, new ());
                     }
 
-                    value.Add(counter);
+                    gpuCounters[phys].Add(counter);
                 }
             }
         }

diff --git a/CoreWidgetProvider/Helpers/IconLoader.cs b/CoreWidgetProvider/Helpers/IconLoader.cs
@@ -10,14 +10,13 @@ public class IconLoader
     public static string GetIconAsBase64(string filename)
     {
         Log.Logger()?.ReportDebug(nameof(IconLoader), $"Asking for icon: {filename}");
-        if (!Base64ImageRegistry.TryGetValue(filename, out var value))
+        if (!Base64ImageRegistry.ContainsKey(filename))
         {
-            value = ConvertIconToDataString(filename);
-            Base64ImageRegistry.Add(filename, value);
+            Base64ImageRegistry.Add(filename, ConvertIconToDataString(filename));
             Log.Logger()?.ReportDebug(nameof(IconLoader), $"The icon {filename} was converted and is now stored.");
         }
 
-        return value;
+        return Base64ImageRegistry[filename];
     }
 
     private static string ConvertIconToDataString(string fileName)

diff --git a/CoreWidgetProvider/Helpers/MemoryStats.cs b/CoreWidgetProvider/Helpers/MemoryStats.cs
@@ -7,7 +7,7 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class MemoryStats : IDisposable
+internal class MemoryStats : IDisposable
 {
     private readonly PerformanceCounter memCommitted = new ("Memory", "Committed Bytes", string.Empty);
     private readonly PerformanceCounter memCached = new ("Memory", "Cache Bytes", string.Empty);

diff --git a/CoreWidgetProvider/Helpers/NetworkStats.cs b/CoreWidgetProvider/Helpers/NetworkStats.cs
@@ -5,15 +5,15 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class NetworkStats : IDisposable
+internal class NetworkStats : IDisposable
 {
     private readonly Dictionary<string, List<PerformanceCounter>> networkCounters = new ();
 
     private Dictionary<string, Data> NetworkUsages { get; set; } = new Dictionary<string, Data>();
 
     private Dictionary<string, List<float>> NetChartValues { get; set; } = new Dictionary<string, List<float>>();
 
-    public sealed class Data
+    public class Data
     {
         public float Usage
         {
@@ -114,12 +114,12 @@ public Data GetNetworkUsage(int networkIndex)
         }
 
         var currNetworkName = NetChartValues.ElementAt(networkIndex).Key;
-        if (!NetworkUsages.TryGetValue(currNetworkName, out var value))
+        if (!NetworkUsages.ContainsKey(currNetworkName))
         {
             return new Data();
         }
 
-        return value;
+        return NetworkUsages[currNetworkName];
     }
 
     public int GetPrevNetworkIndex(int networkIndex)

diff --git a/CoreWidgetProvider/Helpers/Resources.cs b/CoreWidgetProvider/Helpers/Resources.cs
@@ -51,8 +51,8 @@ public static string ReplaceIdentifers(string str, string[] resourceIdentifiers,
     // These are all the string identifiers that appear in widgets.
     public static string[] GetWidgetResourceIdentifiers()
     {
-        return
-        [
+        return new string[]
+        {
             "Widget_Template/Loading",
             "Widget_Template_Tooltip/Submit",
             "SSH_Widget_Template/Name",
@@ -89,6 +89,6 @@ public static string[] GetWidgetResourceIdentifiers()
             "CPUUsage_Widget_Template/End_Process",
             "Widget_Template_Button/Save",
             "Widget_Template_Button/Cancel",
-        ];
+        };
     }
 }
diff --git a/CoreWidgetProvider/Helpers/SystemData.cs b/CoreWidgetProvider/Helpers/SystemData.cs
@@ -3,7 +3,7 @@
 
 namespace CoreWidgetProvider.Helpers;
 
-internal sealed class SystemData : IDisposable
+internal class SystemData : IDisposable
 {
     public static MemoryStats MemStats { get; set; } = new MemoryStats();
 

diff --git a/CoreWidgetProvider/Widgets/CoreWidget.cs b/CoreWidgetProvider/Widgets/CoreWidget.cs
@@ -125,10 +125,10 @@ public virtual string GetData(WidgetPageState page)
 
     protected string GetTemplateForPage(WidgetPageState page)
     {
-        if (Template.TryGetValue(page, out var value))
+        if (Template.ContainsKey(page))
         {
             Log.Logger()?.ReportDebug(Name, ShortId, $"Using cached template for {page}");
-            return value;
+            return Template[page];
         }
 
         try

diff --git a/CoreWidgetProvider/Widgets/SSHWalletWidget.cs b/CoreWidgetProvider/Widgets/SSHWalletWidget.cs
@@ -13,17 +13,17 @@
 
 namespace CoreWidgetProvider.Widgets;
 
-internal sealed class SSHWalletWidget : CoreWidget
+internal class SSHWalletWidget : CoreWidget
 {
-    private static readonly string DefaultConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\.ssh\\config";
+    protected static readonly string DefaultConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\.ssh\\config";
 
     private static readonly Regex HostRegex = new (@"^Host\s+(\S*)\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline);
 
     private FileSystemWatcher? FileWatcher { get; set; }
 
-    private static readonly new string Name = nameof(SSHWalletWidget);
+    protected static readonly new string Name = nameof(SSHWalletWidget);
 
-    private string ConfigFile
+    protected string ConfigFile
     {
         get => State();
 
@@ -405,7 +405,7 @@ private void SetConfigure()
     }
 }
 
-internal sealed class DataPayload
+internal class DataPayload
 {
     public string? ConfigFile
     {
@@ -415,6 +415,6 @@ internal sealed class DataPayload
 
 [JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(DataPayload))]
-internal sealed partial class SourceGenerationContext : JsonSerializerContext
+internal partial class SourceGenerationContext : JsonSerializerContext
 {
 }
diff --git a/CoreWidgetProvider/Widgets/SystemCPUUsageWidget.cs b/CoreWidgetProvider/Widgets/SystemCPUUsageWidget.cs
@@ -8,11 +8,11 @@
 using Microsoft.Windows.Widgets.Providers;
 
 namespace CoreWidgetProvider.Widgets;
-internal sealed class SystemCPUUsageWidget : CoreWidget, IDisposable
+internal class SystemCPUUsageWidget : CoreWidget, IDisposable
 {
     private static Dictionary<string, string> Templates { get; set; } = new ();
 
-    private static readonly new string Name = nameof(SystemCPUUsageWidget);
+    protected static readonly new string Name = nameof(SystemCPUUsageWidget);
 
     private readonly DataManager dataManager;
 

diff --git a/CoreWidgetProvider/Widgets/SystemGPUUsageWidget.cs b/CoreWidgetProvider/Widgets/SystemGPUUsageWidget.cs
@@ -9,11 +9,11 @@
 using Microsoft.Windows.Widgets.Providers;
 
 namespace CoreWidgetProvider.Widgets;
-internal sealed class SystemGPUUsageWidget : CoreWidget, IDisposable
+internal class SystemGPUUsageWidget : CoreWidget, IDisposable
 {
     private static Dictionary<string, string> Templates { get; set; } = new ();
 
-    private static readonly new string Name = nameof(SystemGPUUsageWidget);
+    protected static readonly new string Name = nameof(SystemGPUUsageWidget);
 
     private readonly DataManager dataManager;
 

diff --git a/CoreWidgetProvider/Widgets/SystemMemoryWidget.cs b/CoreWidgetProvider/Widgets/SystemMemoryWidget.cs
@@ -8,11 +8,11 @@
 
 namespace CoreWidgetProvider.Widgets;
 
-internal sealed class SystemMemoryWidget : CoreWidget, IDisposable
+internal class SystemMemoryWidget : CoreWidget, IDisposable
 {
     private static Dictionary<string, string> Templates { get; set; } = new ();
 
-    private static readonly new string Name = nameof(SystemMemoryWidget);
+    protected static readonly new string Name = nameof(SystemMemoryWidget);
 
     private readonly DataManager dataManager;
 

diff --git a/CoreWidgetProvider/Widgets/SystemNetworkUsageWidget.cs b/CoreWidgetProvider/Widgets/SystemNetworkUsageWidget.cs
@@ -8,13 +8,13 @@
 using Microsoft.Windows.Widgets.Providers;
 
 namespace CoreWidgetProvider.Widgets;
-internal sealed class SystemNetworkUsageWidget : CoreWidget, IDisposable
+internal class SystemNetworkUsageWidget : CoreWidget, IDisposable
 {
     private static Dictionary<string, string> Templates { get; set; } = new ();
 
     private int networkIndex;
 
-    private static readonly new string Name = nameof(SystemNetworkUsageWidget);
+    protected static readonly new string Name = nameof(SystemNetworkUsageWidget);
 
     private readonly DataManager dataManager;
 

diff --git a/CoreWidgetProvider/Widgets/WidgetImplFactory.cs b/CoreWidgetProvider/Widgets/WidgetImplFactory.cs
@@ -5,7 +5,7 @@
 using Microsoft.Windows.Widgets.Providers;
 
 namespace CoreWidgetProvider.Widgets;
-internal sealed class WidgetImplFactory<T> : IWidgetImplFactory
+internal class WidgetImplFactory<T> : IWidgetImplFactory
     where T : WidgetImpl, new()
 {
     public WidgetImpl Create(WidgetContext widgetContext, string state)