(GH-146) Particular.ServiceControl.Management powershell 7.2 >= requi…

…rement
TraGicCode · Dec 12, 2023 · eefea37 · eefea37
1 parent d610ed8
commit eefea37
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ The nservicebusservicecontrol module requires the following:
 * Access to the internet.
 * Microsoft .NET 4.6.1 Runtime.
 * Windows Server 2012/2012R2/2016/2019.
+* Powershell v7.2 or greater (pwsh/powershell-core)
 
 ### Beginning with nservicebusservicecontrol
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -6,16 +6,12 @@
 # @param package_source
 #   The package source for the package.
 #
-# @param powershell_package_provider
-#   Whether to use Windows PowerShell or PowerShell Core to install the Particular.ServiceControl.Management PowerShell module.
-#
 # @param license_xml
 #   A valid NServiceBus XML License. 
 #
 class nservicebusservicecontrol (
   String $package_ensure           = 'present',
   Optional[String] $package_source = undef,
-  Optional[Enum['windowspowershell', 'powershellcore']] $powershell_package_provider = 'windowspowershell',
   Optional[String] $license_xml    = '',
 ) {
   contain nservicebusservicecontrol::install

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -4,10 +4,15 @@
 # @api private
 #
 class nservicebusservicecontrol::install {
+  package { 'PackageManagement':
+    ensure   => 'present',
+    source   => 'PSGallery',
+    provider => 'powershellcore',
+  }
   package { 'Particular.ServiceControl.Management':
     ensure   => $nservicebusservicecontrol::package_ensure,
     source   => 'PSGallery',
-    provider => $nservicebusservicecontrol::powershell_package_provider,
+    provider => 'powershellcore',
   }
   package { 'servicecontrol':
     ensure   => $nservicebusservicecontrol::package_ensure,

diff --git a/spec/acceptance/01_smoke_spec.rb b/spec/acceptance/01_smoke_spec.rb
@@ -15,7 +15,6 @@
     <<-MANIFEST
     class { 'nservicebusservicecontrol':
       package_ensure              => '#{@older_package_version}',
-      powershell_package_provider => 'powershellcore',
     }
 
     $primary_service_control_instance = 'Particular.ServiceControl.Development'
@@ -92,7 +91,6 @@ class { 'nservicebusservicecontrol':
       <<-MANIFEST
       class { 'nservicebusservicecontrol':
         package_ensure              => '#{@latest_package_version}',
-        powershell_package_provider => 'powershellcore',
       }
 
       $primary_service_control_instance = 'Particular.ServiceControl.Development'