🪲 [Fix]: Setting PowerShellVersion correctly after tests (#19)

MariusStorhaug · web-flow · commit 5cec0911b36b · 2024-03-28T18:04:18.000+01:00
## Description - Fix an issue where the version would be set incorrectly after tests. ## Type of change  - [ ] 📖 [Docs] - [x] 🪲 [Fix] - [ ] 🩹 [Patch] - [ ] ⚠️ [Security fix] - [ ] 🚀 [Feature] - [ ] 🌟 [Breaking change] ## Checklist  - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -344,17 +344,18 @@ jobs:
           }
           Write-Host ($data | Format-Table | Out-String)
 
+          Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '5.1'
+
           if ($Desktop) {
               Add-ModuleManifestData -Path $moduleManifestPath -CompatiblePSEditions 'Desktop'
               Add-ModuleManifestData -Path $moduleManifestPath -Tags 'PSEdition_Desktop'
+          } else {
+              Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '7.0'
           }
 
           if ($Core) {
               Add-ModuleManifestData -Path $moduleManifestPath -CompatiblePSEditions 'Core'
               Add-ModuleManifestData -Path $moduleManifestPath -Tags 'PSEdition_Core'
-              Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '7.0'
-          } else {
-              Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '5.1'
           }
 
           if ($Linux) {

Original file line number	Diff line number	Diff line change
`@@ -344,17 +344,18 @@ jobs:`
`344`	`344`	`}`
`345`	`345`	`Write-Host ($data \| Format-Table \| Out-String)`
`346`	`346`
	`347`	`+ Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '5.1'`
	`348`	`+`
`347`	`349`	`if ($Desktop) {`
`348`	`350`	`Add-ModuleManifestData -Path $moduleManifestPath -CompatiblePSEditions 'Desktop'`
`349`	`351`	`Add-ModuleManifestData -Path $moduleManifestPath -Tags 'PSEdition_Desktop'`
	`352`	`+ } else {`
	`353`	`+ Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '7.0'`
`350`	`354`	`}`
`351`	`355`
`352`	`356`	`if ($Core) {`
`353`	`357`	`Add-ModuleManifestData -Path $moduleManifestPath -CompatiblePSEditions 'Core'`
`354`	`358`	`Add-ModuleManifestData -Path $moduleManifestPath -Tags 'PSEdition_Core'`
`355`		`- Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '7.0'`
`356`		`- } else {`
`357`		`- Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '5.1'`
`358`	`359`	`}`
`359`	`360`
`360`	`361`	`if ($Linux) {`