Support minimum PowerShell 7.4 as PowerShell 7.2 is now out of support (#4619)

DavidBoike · bording · web-flow · commit 88df416b04c9 · 2024-11-18T22:55:38.000Z
* Support minimum PowerShell 7.4 as PowerShell 7.2 is now out of support with .NET 6

* Collection initializers

* Custom exception constructors for binary serialization are now obsolete

* Remove LangVersion

* Use ZipFile instead of ZipArchive

* Move global.json to root

---------

Co-authored-by: Brandon Ording &lt;bording@gmail.com&gt;
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -18,6 +18,8 @@ jobs:
         uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: 8.0.x
+      - name: dotnet info
+        run: dotnet --info
       - name: Download RavenDB Server
         shell: pwsh
         run: ./tools/download-ravendb-server.ps1
diff --git a/global.json b/global.json
@@ -0,0 +1,9 @@
+{
+  "sdk": {
+    "version": "8.0.400",
+    "rollForward": "latestFeature"
+  },
+  "msbuild-sdks": {
+    "Microsoft.Build.NoTargets": "3.7.56"
+  }
+}
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -65,7 +65,7 @@
     <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Management" Version="8.0.0" />
-    <PackageVersion Include="System.Management.Automation" Version="7.2.21" />
+    <PackageVersion Include="System.Management.Automation" Version="7.4.6" />
     <PackageVersion Include="System.Reactive.Linq" Version="6.0.1" />
     <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="8.0.1" />
     <PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
diff --git a/src/ServiceControl.LicenseManagement/LicenseDetails.cs b/src/ServiceControl.LicenseManagement/LicenseDetails.cs
@@ -33,7 +33,7 @@ public static LicenseDetails TrialFromEndDate(DateOnly endDate)
                 LicenseType = "Trial",
                 ExpirationDate = endDate.ToDateTime(TimeOnly.MinValue),
                 IsExtendedTrial = false,
-                ValidApplications = new List<string> { "All" }
+                ValidApplications = ["All"]
             });
         }
 
@@ -44,7 +44,7 @@ public static LicenseDetails TrialExpired()
                 LicenseType = "Trial",
                 ExpirationDate = DateTime.UtcNow.Date.AddDays(-2), //HasLicenseDateExpired uses a grace period of 1 day
                 IsExtendedTrial = false,
-                ValidApplications = new List<string> { "All" }
+                ValidApplications = ["All"]
             });
         }
 
diff --git a/src/ServiceControl.LicenseManagement/ServiceControl.LicenseManagement.csproj b/src/ServiceControl.LicenseManagement/ServiceControl.LicenseManagement.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ServiceControl.Management.PowerShell/Particular.ServiceControl.Management.psd1 b/src/ServiceControl.Management.PowerShell/Particular.ServiceControl.Management.psd1
@@ -25,7 +25,7 @@ Copyright = '© 2010-{{Date}} NServiceBus Ltd. All rights reserved'
 Description = 'ServiceControl Management'
 
 # Minimum version of the PowerShell engine required by this module
-PowerShellVersion = '7.2'
+PowerShellVersion = '7.4'
 
 # Name of the PowerShell host required by this module
 # PowerShellHostName = ''
diff --git a/src/ServiceControl.Management.PowerShell/ServiceControl.Management.PowerShell.csproj b/src/ServiceControl.Management.PowerShell/ServiceControl.Management.PowerShell.csproj
@@ -12,12 +12,11 @@
   -->
 
   <PropertyGroup>
-    <!-- Must stay net6.0 to support PowerShell 7.2 LTS -->
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <!-- Must stay net8.0 to support PowerShell 7.4 LTS -->
+    <TargetFramework>net8.0-windows</TargetFramework>
 
     <!--Ensures that all project references are explicitly defined in this file -->
     <DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
-    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ServiceControlInstaller.Engine/Accounts/Lsa.cs b/src/ServiceControlInstaller.Engine/Accounts/Lsa.cs
@@ -25,7 +25,7 @@ public static string[] GetPrivileges(string identity)
                 // the user has no privileges
                 if (win32ErrorCode == StatusObjectNameNotFound)
                 {
-                    return new string[0];
+                    return [];
                 }
 
                 HandleLsaResult(result);
diff --git a/src/ServiceControlInstaller.Engine/Configuration/ServiceControl/UpgradeInfo.cs b/src/ServiceControlInstaller.Engine/Configuration/ServiceControl/UpgradeInfo.cs
@@ -6,13 +6,13 @@
     public class UpgradeInfo
     {
         static readonly SemanticVersion[] LastVersionForEachMajor =
-        {
+        [
             new(1, 48, 0),
             new(2, 1, 5),
             new(3, 8, 4),
             new(4, 33, 0), // Added IngestErrorMessages setting to enable message replay during 4to5 upgrade guide scenario 
-            new(5, 11, 0),
-        };
+            new(5, 11, 0)
+        ];
 
         public SemanticVersion[] UpgradePath { get; private init; }
         public bool HasIncompatibleVersion { get; private init; }
diff --git a/src/ServiceControlInstaller.Engine/FileSystem/FileUtils.cs b/src/ServiceControlInstaller.Engine/FileSystem/FileUtils.cs
@@ -147,8 +147,7 @@ public static void UnzipToSubdirectory(string zipResourceName, string targetPath
 
         internal static void UnzipToSubdirectory(Stream zipStream, string targetPath)
         {
-            using var zip = new ZipArchive(zipStream, ZipArchiveMode.Read, leaveOpen: false);
-            zip.ExtractToDirectory(targetPath, overwriteFiles: true);
+            ZipFile.ExtractToDirectory(zipStream, targetPath, overwriteFiles: true);
         }
 
         static void RunWithRetries(Action action)
@@ -165,7 +164,7 @@ static void RunWithRetries(Action action)
                 {
                     Debug.WriteLine($"ServiceControlInstaller.Engine.FileSystem.FileUtils::RunWithRetries Action failed, {attempts} attempts remaining. Reason: {ex.Message} ({ex.GetType().FullName})");
                     // Yes, Task.Delay would be better but would require all calls to be async
-                    // and in 99.9% this sleep will not hit 
+                    // and in 99.9% this sleep will not hit
                     Thread.Sleep(100);
                 }
             }
diff --git a/src/ServiceControlInstaller.Engine/Instances/MonitoringNewInstance.cs b/src/ServiceControlInstaller.Engine/Instances/MonitoringNewInstance.cs
@@ -32,11 +32,11 @@ string[] FlagFiles
             get
             {
                 const string flagFileName = ".notconfigured";
-                return new[]
-                {
+                return
+                [
                     Path.Combine(InstallPath, flagFileName),
                     Path.Combine(LogPath, flagFileName)
-                };
+                ];
             }
         }
 
diff --git a/src/ServiceControlInstaller.Engine/Instances/PersistenceManifest.cs b/src/ServiceControlInstaller.Engine/Instances/PersistenceManifest.cs
@@ -15,11 +15,11 @@ public class PersistenceManifest
 
         public bool IsSupported { get; set; } = true;
 
-        public Setting[] Settings { get; set; } = Array.Empty<Setting>();
+        public Setting[] Settings { get; set; } = [];
 
-        public string[] SettingsWithPathsToCleanup { get; set; } = Array.Empty<string>();
+        public string[] SettingsWithPathsToCleanup { get; set; } = [];
 
-        public string[] Aliases { get; set; } = Array.Empty<string>();
+        public string[] Aliases { get; set; } = [];
 
         internal bool IsMatch(string persistenceType) =>
             string.Equals(TypeName, persistenceType, StringComparison.Ordinal) // Type names are case-sensitive
diff --git a/src/ServiceControlInstaller.Engine/Instances/ServiceControlBaseService.cs b/src/ServiceControlInstaller.Engine/Instances/ServiceControlBaseService.cs
@@ -330,7 +330,7 @@ public virtual void DisableMaintenanceMode()
 
         protected virtual IEnumerable<string> GetPersistencePathsToCleanUp()
         {
-            return Enumerable.Empty<string>();
+            return [];
         }
 
         protected virtual void ValidateConnectionString()
diff --git a/src/ServiceControlInstaller.Engine/Instances/ServiceControlInstallableBase.cs b/src/ServiceControlInstaller.Engine/Instances/ServiceControlInstallableBase.cs
@@ -59,12 +59,12 @@ string[] FlagFiles
             get
             {
                 const string flagFileName = ".notconfigured";
-                return new[]
-                {
+                return
+                [
                     Path.Combine(InstallPath, flagFileName),
                     Path.Combine(DBPath, flagFileName),
                     Path.Combine(LogPath, flagFileName)
-                };
+                ];
             }
         }
 
diff --git a/src/ServiceControlInstaller.Engine/Instances/ServiceControlInstance.cs b/src/ServiceControlInstaller.Engine/Instances/ServiceControlInstance.cs
@@ -26,7 +26,7 @@ public ServiceControlInstance(IWindowsServiceController service) : base(service)
 
         public TimeSpan? AuditRetentionPeriod { get; set; }
 
-        public List<RemoteInstanceSetting> RemoteInstances { get; set; } = new List<RemoteInstanceSetting>();
+        public List<RemoteInstanceSetting> RemoteInstances { get; set; } = [];
 
         public PersistenceManifest PersistenceManifest { get; set; }
 
@@ -207,12 +207,12 @@ protected override void Prepare(string zipFilePath, string destDir)
         protected override IEnumerable<string> GetPersistencePathsToCleanUp()
         {
             string[] keys =
-            {
+            [
                 "Raven/IndexStoragePath",
                 "Raven/CompiledIndexCacheDirectory",
                 "Raven/Esent/LogsPath",
                 ServiceControlSettings.DBPath.Name
-            };
+            ];
 
             var settings = AppConfig.Config.AppSettings.Settings;
             foreach (var key in keys)
diff --git a/src/ServiceControlInstaller.Engine/Instances/ServiceControlNewInstance.cs b/src/ServiceControlInstaller.Engine/Instances/ServiceControlNewInstance.cs
@@ -42,7 +42,7 @@ public override void WriteConfigurationFile()
 
         public override string DirectoryName => "ServiceControl";
 
-        public List<RemoteInstanceSetting> RemoteInstances { get; set; } = new List<RemoteInstanceSetting>();
+        public List<RemoteInstanceSetting> RemoteInstances { get; set; } = [];
 
         public void AddRemoteInstance(string apiUri)
         {
diff --git a/src/ServiceControlInstaller.Engine/Instances/TransportInfo.cs b/src/ServiceControlInstaller.Engine/Instances/TransportInfo.cs
@@ -21,7 +21,7 @@ public class TransportInfo
 
         public string AutoMigrateTo { get; set; }
 
-        public string[] Aliases { get; set; } = Array.Empty<string>();
+        public string[] Aliases { get; set; } = [];
 
         public string ZipName
         {
@@ -65,6 +65,6 @@ public override int GetHashCode()
 
     public class TransportManifest
     {
-        public TransportInfo[] Definitions { get; set; } = Array.Empty<TransportInfo>();
+        public TransportInfo[] Definitions { get; set; } = [];
     }
 }
diff --git a/src/ServiceControlInstaller.Engine/Queues/QueueCreationException.cs b/src/ServiceControlInstaller.Engine/Queues/QueueCreationException.cs
@@ -1,7 +1,6 @@
 namespace ServiceControlInstaller.Engine.Queues
 {
     using System;
-    using System.Runtime.Serialization;
 
     public class QueueCreationFailedException : Exception
     {
@@ -12,11 +11,5 @@ public QueueCreationFailedException(string message) : base(message)
         public QueueCreationFailedException(string message, Exception inner) : base(message, inner)
         {
         }
-
-        protected QueueCreationFailedException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/ServiceControlInstaller.Engine/Queues/QueueCreationTimeoutException.cs b/src/ServiceControlInstaller.Engine/Queues/QueueCreationTimeoutException.cs
@@ -1,7 +1,6 @@
 ﻿namespace ServiceControlInstaller.Engine.Queues
 {
     using System;
-    using System.Runtime.Serialization;
 
     public class QueueCreationTimeoutException : Exception
     {
@@ -12,11 +11,5 @@ public QueueCreationTimeoutException(string message) : base(message)
         public QueueCreationTimeoutException(string message, Exception inner) : base(message, inner)
         {
         }
-
-        protected QueueCreationTimeoutException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/ServiceControlInstaller.Engine/Queues/ServiceControlQueueCreationTimeoutException.cs b/src/ServiceControlInstaller.Engine/Queues/ServiceControlQueueCreationTimeoutException.cs
@@ -1,7 +1,6 @@
 ﻿namespace ServiceControlInstaller.Engine.Queues
 {
     using System;
-    using System.Runtime.Serialization;
 
     public class ServiceControlQueueCreationTimeoutException : Exception
     {
@@ -12,11 +11,5 @@ public ServiceControlQueueCreationTimeoutException(string message) : base(messag
         public ServiceControlQueueCreationTimeoutException(string message, Exception inner) : base(message, inner)
         {
         }
-
-        protected ServiceControlQueueCreationTimeoutException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/ServiceControlInstaller.Engine/ReportCard/TruncatedStringList.cs b/src/ServiceControlInstaller.Engine/ReportCard/TruncatedStringList.cs
@@ -96,7 +96,7 @@ public void AddRange(IEnumerable<string> items)
             }
         }
 
-        List<string> itemList = new List<string>();
+        List<string> itemList = [];
 
         int maxLength;
     }
diff --git a/src/ServiceControlInstaller.Engine/ServiceControlInstaller.Engine.csproj b/src/ServiceControlInstaller.Engine/ServiceControlInstaller.Engine.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- Must stay net6.0 to support PowerShell 7.2 LTS -->
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <!-- Must stay net8.0 to support PowerShell 7.4 LTS -->
+    <TargetFramework>net8.0-windows</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
diff --git a/src/ServiceControlInstaller.Engine/Services/WindowsServiceController.cs b/src/ServiceControlInstaller.Engine/Services/WindowsServiceController.cs
@@ -287,7 +287,7 @@ internal static IEnumerable<WindowsServiceController> FindInstancesByExe(string
 
 
         static readonly string[] Win32ChangeErrorMessages =
-        {
+        [
             "The request was accepted",
             "The request is not supported",
             "Access Denied",
@@ -313,10 +313,10 @@ internal static IEnumerable<WindowsServiceController> FindInstancesByExe(string
             "The account under which this service runs is either invalid or lacks the permissions to run the service",
             "The service exists in the database of services available from the system",
             "The service is currently paused in the system"
-        };
+        ];
 
         static readonly string[] Win32ServiceErrorMessages =
-        {
+        [
             "The request was accepted.",
             "The request is not supported.",
             "The user did not have the necessary access.",
@@ -342,6 +342,6 @@ internal static IEnumerable<WindowsServiceController> FindInstancesByExe(string
             "The account under which this service runs is either invalid or lacks the permissions to run the service.",
             "The service exists in the database of services available from the system.",
             "The service is currently paused in the system."
-        };
+        ];
     }
 }
diff --git a/src/ServiceControlInstaller.Engine/UrlAcl/UrlReservation.cs b/src/ServiceControlInstaller.Engine/UrlAcl/UrlReservation.cs
@@ -311,7 +311,7 @@ public byte[] ToSystemAclBytes()
             return bytes;
         }
 
-        List<SecurityIdentifier> securityIdentifiers = new List<SecurityIdentifier>();
+        List<SecurityIdentifier> securityIdentifiers = [];
 
         const int GENERIC_EXECUTE = 536870912;
         static Regex urlPattern = new Regex(@"^(?<protocol>https?)://(?<hostname>([^/]*?))(:(?<port>\d{0,5}))?(/(?<virtual>[^:]*))?/$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
diff --git a/src/ServiceControlInstaller.Engine/Validation/QueueNameValidator.cs b/src/ServiceControlInstaller.Engine/Validation/QueueNameValidator.cs
diff --git a/src/global.json b/src/global.json

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static string[] GetPrivileges(string identity)`
`25`	`25`	`// the user has no privileges`
`26`	`26`	`if (win32ErrorCode == StatusObjectNameNotFound)`
`27`	`27`	`{`
`28`		`- return new string[0];`
	`28`	`+ return [];`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`HandleLsaResult(result);`
Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ public static void UnzipToSubdirectory(string zipResourceName, string targetPath`
`147`	`147`
`148`	`148`	`internal static void UnzipToSubdirectory(Stream zipStream, string targetPath)`
`149`	`149`	`{`
`150`		`- using var zip = new ZipArchive(zipStream, ZipArchiveMode.Read, leaveOpen: false);`
`151`		`- zip.ExtractToDirectory(targetPath, overwriteFiles: true);`
	`150`	`+ ZipFile.ExtractToDirectory(zipStream, targetPath, overwriteFiles: true);`
`152`	`151`	`}`
`153`	`152`
`154`	`153`	`static void RunWithRetries(Action action)`
`@@ -165,7 +164,7 @@ static void RunWithRetries(Action action)`
`165`	`164`	`{`
`166`	`165`	`Debug.WriteLine($"ServiceControlInstaller.Engine.FileSystem.FileUtils::RunWithRetries Action failed, {attempts} attempts remaining. Reason: {ex.Message} ({ex.GetType().FullName})");`
`167`	`166`	`// Yes, Task.Delay would be better but would require all calls to be async`
`168`		`- // and in 99.9% this sleep will not hit`
	`167`	`+ // and in 99.9% this sleep will not hit`
`169`	`168`	`Thread.Sleep(100);`
`170`	`169`	`}`
`171`	`170`	`}`