Merge pull request #254 from anmenaga/test

SteveL-MSFT · web-flow · commit f6c6fcd9dfb9 · 2023-11-07T20:49:54.000Z
Re-enabled PowerShellGroup resource for PS 7.4.0-rc.1 or newer
diff --git a/powershellgroup/powershellgroup.resource.ps1 b/powershellgroup/powershellgroup.resource.ps1
@@ -33,9 +33,10 @@ function RefreshCache
     }
 }
 
-if (($PSVersionTable.PSVersion.Major -ge 7) -and ($PSVersionTable.PSVersion.Minor -ge 4))
+if (($PSVersionTable.PSVersion.Major -ge 7) -and ($PSVersionTable.PSVersion.Minor -ge 4) `
+   -and ($PSVersionTable.PSVersion.PreReleaseLabel.StartsWith("preview")))
 {
-    throw "PowerShell 7.4 is not currently supported by PowerShellGroup resource; please use PS 7.3.  Tracking issue: https://github.com/PowerShell/DSC/issues/128"
+    throw "PowerShell 7.4-previews are not supported by PowerShellGroup resource; please use PS 7.4.0-rc.1 or newer."
 }
 
 $DscModule = Get-Module -Name PSDesiredStateConfiguration -ListAvailable |

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,10 @@ function RefreshCache`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-if (($PSVersionTable.PSVersion.Major -ge 7) -and ($PSVersionTable.PSVersion.Minor -ge 4))`
	`36`	+if (($PSVersionTable.PSVersion.Major -ge 7) -and ($PSVersionTable.PSVersion.Minor -ge 4) `
	`37`	`+ -and ($PSVersionTable.PSVersion.PreReleaseLabel.StartsWith("preview")))`
`37`	`38`	`{`
`38`		`- throw "PowerShell 7.4 is not currently supported by PowerShellGroup resource; please use PS 7.3. Tracking issue: https://github.com/PowerShell/DSC/issues/128"`
	`39`	`+ throw "PowerShell 7.4-previews are not supported by PowerShellGroup resource; please use PS 7.4.0-rc.1 or newer."`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`$DscModule = Get-Module -Name PSDesiredStateConfiguration -ListAvailable \|`