Skip to content

Commit 9ef5ec4

Browse files
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 parent d0d39c0 commit 9ef5ec4

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

.pipelines/templates/release-MSIX-Publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
- task: MS-RDX-MRO.windows-store-publish.publish-task.store-publish@3
102102
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')))
104104
inputs:
105105
serviceEndpoint: 'StoreAppPublish-Stable'
106106
appId: '$(AppID)'
@@ -113,7 +113,7 @@ jobs:
113113

114114
- task: MS-RDX-MRO.windows-store-publish.publish-task.store-publish@3
115115
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'))
117117
inputs:
118118
serviceEndpoint: 'StoreAppPublish-Preview'
119119
appId: '$(AppID)'

build.psm1

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,19 +2485,21 @@ function Start-PSBootstrap {
24852485
Write-LogGroupEnd -Title "Install Windows Dependencies"
24862486
}
24872487

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
24912490

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"
24942495

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"
24992502
}
2500-
Write-LogGroupEnd -Title "Install .NET Global Tools"
25012503
}
25022504

25032505
if ($env:TF_BUILD) {

0 commit comments

Comments
 (0)