Update to .NET 9 and fix new analyzer inspections

Fs00 · Nov 24, 2024 · 3f61008 · 3f61008
1 parent f786b59
commit 3f61008
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 31 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.200",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/AppConfiguration.cs b/src/AppConfiguration.cs
@@ -6,7 +6,7 @@
 
 namespace Win10BloatRemover;
 
-public class AppConfiguration
+class AppConfiguration
 {
     public required string[] ServicesToRemove { get; init; }
     public required UwpAppGroup[] UWPAppsToRemove { get; init; }

diff --git a/src/Operations/AutoUpdatesDisabler.cs b/src/Operations/AutoUpdatesDisabler.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class AutoUpdatesDisabler(IUserInterface ui) : IOperation
+class AutoUpdatesDisabler(IUserInterface ui) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/BrowserOpener.cs b/src/Operations/BrowserOpener.cs
@@ -2,7 +2,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class BrowserOpener(string url) : IOperation
+class BrowserOpener(string url) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/ConsumerFeaturesDisabler.cs b/src/Operations/ConsumerFeaturesDisabler.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class ConsumerFeaturesDisabler(IUserInterface ui) : IOperation
+class ConsumerFeaturesDisabler(IUserInterface ui) : IOperation
 {
     public bool IsRebootRecommended { get; private set; }
 

diff --git a/src/Operations/DefenderDisabler.cs b/src/Operations/DefenderDisabler.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class DefenderDisabler(IUserInterface ui, ServiceRemover serviceRemover) : IOperation
+class DefenderDisabler(IUserInterface ui, ServiceRemover serviceRemover) : IOperation
 {
     private static readonly string[] defenderServices = [
         "wscsvc",

diff --git a/src/Operations/EdgeRemover.cs b/src/Operations/EdgeRemover.cs
@@ -8,7 +8,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class EdgeRemover(IUserInterface ui, AppxRemover appxRemover) : IOperation
+class EdgeRemover(IUserInterface ui, AppxRemover appxRemover) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/ErrorReportingDisabler.cs b/src/Operations/ErrorReportingDisabler.cs
@@ -3,7 +3,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class ErrorReportingDisabler(IUserInterface ui, ServiceRemover serviceRemover) : IOperation
+class ErrorReportingDisabler(IUserInterface ui, ServiceRemover serviceRemover) : IOperation
 {
     private static readonly string[] errorReportingServices = ["WerSvc", "wercplsupport"];
     private static readonly string[] errorReportingScheduledTasks = [

diff --git a/src/Operations/FeaturesRemover.cs b/src/Operations/FeaturesRemover.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class FeaturesRemover(string[] featuresToRemove, IUserInterface ui) : IOperation
+class FeaturesRemover(string[] featuresToRemove, IUserInterface ui) : IOperation
 {
     public bool IsRebootRecommended { get; private set; }
 

diff --git a/src/Operations/IOperation.cs b/src/Operations/IOperation.cs
@@ -1,6 +1,6 @@
 namespace Win10BloatRemover.Operations;
 
-public interface IOperation
+interface IOperation
 {
     void Run();
     bool IsRebootRecommended => false;

diff --git a/src/Operations/LicensePrinter.cs b/src/Operations/LicensePrinter.cs
@@ -3,7 +3,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class LicensePrinter(IUserInterface ui) : IOperation
+class LicensePrinter(IUserInterface ui) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/OneDriveRemover.cs b/src/Operations/OneDriveRemover.cs
@@ -6,7 +6,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class OneDriveRemover(IUserInterface ui) : IOperation
+class OneDriveRemover(IUserInterface ui) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/PrivacySettingsTweaker.cs b/src/Operations/PrivacySettingsTweaker.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class PrivacySettingsTweaker(IUserInterface ui) : IOperation
+class PrivacySettingsTweaker(IUserInterface ui) : IOperation
 {
     private static readonly string[] appPermissionsToDeny = [
         "location",

diff --git a/src/Operations/ScheduledTasksDisabler.cs b/src/Operations/ScheduledTasksDisabler.cs
@@ -3,7 +3,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class ScheduledTasksDisabler(string[] scheduledTasksToDisable, IUserInterface ui) : IOperation
+class ScheduledTasksDisabler(string[] scheduledTasksToDisable, IUserInterface ui) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/ServiceRemover.cs b/src/Operations/ServiceRemover.cs
@@ -5,7 +5,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class ServiceRemovalOperation(string[] servicesToRemove, IUserInterface ui, ServiceRemover serviceRemover) : IOperation
+class ServiceRemovalOperation(string[] servicesToRemove, IUserInterface ui, ServiceRemover serviceRemover) : IOperation
 {
     public bool IsRebootRecommended => serviceRemover.IsRebootRecommended;
 
@@ -26,7 +26,7 @@ public void Run()
  *  Performs backup (export of registry keys) and removal of those services whose name starts with the given service names.
  *  This is made in order to include services that end with a random code.
  */
-public class ServiceRemover
+class ServiceRemover
 {
     private readonly DirectoryInfo backupDirectory;
     private readonly IUserInterface ui;

diff --git a/src/Operations/SuggestionsDisabler.cs b/src/Operations/SuggestionsDisabler.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class SuggestionsDisabler(IUserInterface ui) : IOperation
+class SuggestionsDisabler(IUserInterface ui) : IOperation
 {
     public void Run()
     {

diff --git a/src/Operations/TelemetryDisabler.cs b/src/Operations/TelemetryDisabler.cs
@@ -4,7 +4,7 @@
 
 namespace Win10BloatRemover.Operations;
 
-public class TelemetryDisabler(IUserInterface ui, ServiceRemover serviceRemover) : IOperation
+class TelemetryDisabler(IUserInterface ui, ServiceRemover serviceRemover) : IOperation
 {
     private static readonly string[] telemetryServices = [
         "DiagTrack",

diff --git a/src/Operations/UwpAppGroupRemover.cs b/src/Operations/UwpAppGroupRemover.cs
@@ -5,13 +5,13 @@
 
 namespace Win10BloatRemover.Operations;
 
-public enum UwpAppRemovalMode
+enum UwpAppRemovalMode
 {
     CurrentUser,
     AllUsers
 }
 
-public enum UwpAppGroup
+enum UwpAppGroup
 {
     AlarmsAndClock,
     Bing,               // Weather, News, Finance and Sports
@@ -38,7 +38,7 @@ public enum UwpAppGroup
     Zune                // Groove Music and Movies
 }
 
-public class UwpAppGroupRemover : IOperation
+class UwpAppGroupRemover : IOperation
 {
     private static readonly Dictionary<UwpAppGroup, string[]> appNamesForGroup = new() {
         { UwpAppGroup.AlarmsAndClock, new[] { "Microsoft.WindowsAlarms" } },

diff --git a/src/Properties/PublishProfiles/Standalone.pubxml b/src/Properties/PublishProfiles/Standalone.pubxml
@@ -14,7 +14,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishTrimmed>True</PublishTrimmed>
     <TrimMode>full</TrimMode>
     <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
-	<DebuggerSupport>false</DebuggerSupport>
-	<NullabilityInfoContextSupport>false</NullabilityInfoContextSupport>
+    <DebuggerSupport>false</DebuggerSupport>
   </PropertyGroup>
 </Project>
diff --git a/src/UI/IUserInterface.cs b/src/UI/IUserInterface.cs
@@ -1,6 +1,6 @@
 namespace Win10BloatRemover.UI;
 
-public interface IMessagePrinter
+interface IMessagePrinter
 {
     void PrintMessage(string text);
     void PrintError(string text);
@@ -10,13 +10,13 @@ public interface IMessagePrinter
     void PrintEmptySpace();
 }
 
-public enum UserChoice
+enum UserChoice
 {
     Yes,
     No
 }
 
-public interface IUserInterface : IMessagePrinter
+interface IUserInterface : IMessagePrinter
 {
     UserChoice AskUserConsent(string text);
 

diff --git a/src/Utils/AppxRemover.cs b/src/Utils/AppxRemover.cs
@@ -7,9 +7,9 @@
 
 namespace Win10BloatRemover.Utils;
 
-public class AppxRemover(IUserInterface ui)
+class AppxRemover(IUserInterface ui)
 {
-    public readonly record struct Result(int RemovedApps, int FailedRemovals);
+    internal readonly record struct Result(int RemovedApps, int FailedRemovals);
 
     private enum RemovalOutcome
     {

diff --git a/src/Utils/ExitCode.cs b/src/Utils/ExitCode.cs
@@ -1,6 +1,6 @@
 namespace Win10BloatRemover.Utils;
 
-public readonly struct ExitCode(int code)
+readonly struct ExitCode(int code)
 {
     private readonly int code = code;
 

diff --git a/src/Win10BloatRemover.csproj b/src/Win10BloatRemover.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
     <Nullable>enable</Nullable>
     <OutputType>Exe</OutputType>
     <PlatformTarget>x86</PlatformTarget>
@@ -21,7 +21,7 @@
     <Using Include="System.Linq" />	
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Dism" Version="2.5.2" />
+    <PackageReference Include="Microsoft.Dism" Version="3.1.0" />
   </ItemGroup>
   <PropertyGroup>
 	<InvariantGlobalization>true</InvariantGlobalization>