Commit 1ee7adb

authored

OneBranch now uses PowerShell 7.4 so remove workarounds (#2218)

We can rely on the pre-installed PSResourceGet and we can re-enable tests!

1 parent e26f172 commit 1ee7adbCopy full SHA for 1ee7adb

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,9 @@ extends:`
`88`	`88`	`inputs:`
`89`	`89`	`packageType: runtime`
`90`	`90`	`version: 6.x`
`91`		`- - pwsh: \|`
`92`		`- Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted`
`93`		`- Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet`
`94`		`- ./tools/installPSResources.ps1 -PSRepository CFS`
	`91`	`+ - pwsh: ./tools/installPSResources.ps1 -PSRepository CFS`
`95`	`92`	`displayName: Install PSResources`
`96`		`- - pwsh: Invoke-Build Build -Configuration $(BuildConfiguration) -PSRepository CFS`
	`93`	`+ - pwsh: Invoke-Build TestFull -Configuration $(BuildConfiguration) -PSRepository CFS`
`97`	`94`	`displayName: Build and test`
`98`	`95`	`- task: PublishTestResults@2`
`99`	`96`	`displayName: Publish test results`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,16 @@ if ($PSRepository -eq "CFS" -and -not (Get-PSResourceRepository -Name CFS -Error`
`9`	`9`	`Register-PSResourceRepository -Name CFS -Uri "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json"`
`10`	`10`	`}`
`11`	`11`
`12`		`-Install-PSResource -Repository $PSRepository -TrustRepository -Name InvokeBuild`
`13`		`-Install-PSResource -Repository $PSRepository -TrustRepository -Name platyPS`
	`12`	`+# NOTE: Due to a bug in Install-PSResource with upstream feeds, we have to`
	`13`	`+# request an exact version. Otherwise, if a newer version is available in the`
	`14`	`+# upstream feed, it will fail to install any version at all.`
	`15`	`+Install-PSResource -Verbose -TrustRepository -RequiredResource @{`
	`16`	`+ InvokeBuild = @{`
	`17`	`+ version = "5.12.1"`
	`18`	`+ repository = $PSRepository`
	`19`	`+ }`
	`20`	`+ platyPS = @{`
	`21`	`+ version = "0.14.2"`
	`22`	`+ repository = $PSRepository`
	`23`	`+ }`
	`24`	`+}`

Comments

(0)