Commit9ef5ec4

authored

Bring release changes from the v7.6.0-preview.6 release branch (#26627)

1. Fix the conditions used in `release-MSIX-Publish.yml`2. Update `build.psm1` to not install dotnet format tool for ADO build.

1 parentd0d39c0 commit9ef5ec4Copy full SHA for 9ef5ec4

File tree

+14

-12

lines changed

+14

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ jobs:`
`100`	`100`
`101`	`101`	`-task:MS-RDX-MRO.windows-store-publish.publish-task.store-publish@3`
`102`	`102`	`displayName:'Publish StoreBroker Package (Stable/LTS)'`
`103`		`-condition:and(ne('${{ parameters.skipMSIXPublish }}', 'true'), or(eq('$(STABLE)', 'true'), eq('$(LTS)', 'true')))`
	`103`	`+condition:and(ne('${{ parameters.skipMSIXPublish }}', 'true'), or(eq(variables['STABLE'], 'true'), eq(variables['LTS'], 'true')))`
`104`	`104`	`inputs:`
`105`	`105`	`serviceEndpoint:'StoreAppPublish-Stable'`
`106`	`106`	`appId:'$(AppID)'`
`@@ -113,7 +113,7 @@ jobs:`
`113`	`113`
`114`	`114`	`-task:MS-RDX-MRO.windows-store-publish.publish-task.store-publish@3`
`115`	`115`	`displayName:'Publish StoreBroker Package (Preview)'`
`116`		`-condition:and(ne('${{ parameters.skipMSIXPublish }}', 'true'), eq('$(PREVIEW)', 'true'))`
	`116`	`+condition:and(ne('${{ parameters.skipMSIXPublish }}', 'true'), eq(variables['PREVIEW'], 'true'))`
`117`	`117`	`inputs:`
`118`	`118`	`serviceEndpoint:'StoreAppPublish-Preview'`
`119`	`119`	`appId:'$(AppID)'`

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -2485,19 +2485,21 @@ function Start-PSBootstrap {`
`2485`	`2485`	`Write-LogGroupEnd-Title"Install Windows Dependencies"`
`2486`	`2486`	`}`
`2487`	`2487`
`2488`		`-if ($Scenario-in'All','Tools') {`
`2489`		`-Write-LogGroupStart-Title"Install .NET Global Tools"`
`2490`		`-Write-Log-message"Installing .NET global tools"`
	`2488`	`+# Ensure dotnet is available`
	`2489`	`+Find-Dotnet`
`2491`	`2490`
`2492`		`-# Ensure dotnet is available`
`2493`		`-Find-Dotnet`
	`2491`	`+if (-not$env:TF_BUILD) {`
	`2492`	`+if ($Scenario-in'All','Tools') {`
	`2493`	`+Write-LogGroupStart-Title"Install .NET Global Tools"`
	`2494`	`+Write-Log-message"Installing .NET global tools"`
`2494`	`2495`
`2495`		`-# Install dotnet-format`
`2496`		`-Write-Verbose-Verbose"Installing dotnet-format global tool"`
`2497`		`-Start-NativeExecution {`
`2498`		`- dotnet tool install--global dotnet-format`
	`2496`	`+# Install dotnet-format`
	`2497`	`+Write-Verbose-Verbose"Installing dotnet-format global tool"`
	`2498`	`+Start-NativeExecution {`
	`2499`	`+ dotnet tool install--global dotnet-format`
	`2500`	`+ }`
	`2501`	`+Write-LogGroupEnd-Title"Install .NET Global Tools"`
`2499`	`2502`	`}`
`2500`		`-Write-LogGroupEnd-Title"Install .NET Global Tools"`
`2501`	`2503`	`}`
`2502`	`2504`
`2503`	`2505`	`if ($env:TF_BUILD) {`

Comments

(0)