[ci]Fix running xaml styles in CI (#35426)

XAML style checkers aren't running right now in PR CI. This allowed some XAML style errors to cause build errors in release CI.

This PR contains the following fixes:
- Fix XAML style of files that have slipped.
- Add errors to the scripts that depend on dotnet commands if it fails.
- Add .NET 6 on CI so that applyXamlStyling.ps1 and verifyNugetPackages.ps1 run correctly again.
This commit is contained in:
Jaime Bernardo 2024-10-14 14:59:10 +01:00 committed by GitHub
parent 9994fd7715
commit d51ca9f8d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 11 deletions

View File

@ -117,7 +117,10 @@ else
{ {
Write-Error 'XAML Styling is incorrect, please run `.\.pipelines\applyXamlStyling.ps1 -Main` locally.' Write-Error 'XAML Styling is incorrect, please run `.\.pipelines\applyXamlStyling.ps1 -Main` locally.'
} }
if ($lastExitCode -lt 0)
{
Write-Error "Error running dotnet tool run, with the exit code $lastExitCode. Please verify logs and running environment."
}
# Return XAML Styler Status # Return XAML Styler Status
exit $lastExitCode exit $lastExitCode
} }

View File

@ -127,12 +127,10 @@ jobs:
Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters" Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
displayName: Prepare MSBuildCache variables displayName: Prepare MSBuildCache variables
- ${{ if eq(parameters.codeSign, true) }}: - template: steps-ensure-dotnet-version.yml
# Only required if we're using ESRP parameters:
- template: steps-ensure-dotnet-version.yml sdk: true
parameters: version: '6.0'
sdk: true
version: '6.0'
- template: steps-ensure-dotnet-version.yml - template: steps-ensure-dotnet-version.yml
parameters: parameters:

View File

@ -8,6 +8,12 @@ Write-Host "Verifying Nuget packages for $solution"
dotnet tool restore dotnet tool restore
dotnet consolidate -s $solution dotnet consolidate -s $solution
if ($lastExitCode -ne 0)
{
$result = $lastExitCode
Write-Error "Error running dotnet consolidate, with the exit code $lastExitCode. Please verify logs and running environment."
exit $result
}
if (-not $?) if (-not $?)
{ {

View File

@ -72,10 +72,10 @@
x:Name="pluginsHintsList" x:Name="pluginsHintsList"
Grid.Row="1" Grid.Row="1"
Margin="16,0,0,0" Margin="16,0,0,0"
Background="Transparent"
BorderBrush="Transparent"
ItemContainerStyle="{StaticResource PluginsListViewItemStyle}" ItemContainerStyle="{StaticResource PluginsListViewItemStyle}"
ItemsSource="{Binding Plugins}" ItemsSource="{Binding Plugins}"
Background="Transparent"
BorderBrush="Transparent"
PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp" PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"

View File

@ -32,9 +32,9 @@
<ListView <ListView
x:Name="SuggestionsList" x:Name="SuggestionsList"
x:FieldModifier="public" x:FieldModifier="public"
BorderBrush="Transparent"
Background="Transparent"
AutomationProperties.Name="{x:Static p:Resources.Results}" AutomationProperties.Name="{x:Static p:Resources.Results}"
Background="Transparent"
BorderBrush="Transparent"
ItemsSource="{Binding Results.Results, Mode=OneWay}" ItemsSource="{Binding Results.Results, Mode=OneWay}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"