Skip to content

GitHub: Fixed XAML formatting checker #16355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 28, 2024
Merged

GitHub: Fixed XAML formatting checker #16355

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1af6d13
Update ci.yml
0x5bfa Oct 17, 2024
2784021
Update MainPage.xaml
0x5bfa Oct 17, 2024
67db1ce
Update format-xaml.yml
0x5bfa Oct 17, 2024
f585b4d
Update MainPage.xaml
0x5bfa Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ jobs:

if: github.repository_owner == 'files-community'

runs-on: ubuntu-latest
defaults:
run:
shell: pwsh
runs-on: windows-latest

steps:

Expand All @@ -62,10 +59,8 @@ jobs:
fetch-depth: 2
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

- name: Install XamlStyler console
- name: Install XamlStyler.Console
run: 'dotnet tool install --global XamlStyler.Console'

- name: Check XAML formatting
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/format-xaml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ on:
jobs:
format-xaml:
if: github.event.issue.pull_request && github.event.comment.body == '/format'
runs-on: ubuntu-latest
runs-on: windows-latest
environment: Pull Requests
defaults:
run:
shell: pwsh
permissions:
contents: write

Expand Down Expand Up @@ -48,8 +45,6 @@ jobs:

- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

- name: Set git identity
if: env.CAN_RUN == 1
Expand Down Expand Up @@ -79,7 +74,7 @@ jobs:
"CAN_RUN=0" | Out-File -FilePath $env:GITHUB_ENV -Append
}

- name: Install Xaml Styler
- name: Install XamlStyler.Console
if: env.CAN_RUN == 1
run: dotnet tool install --global XamlStyler.Console

Expand Down
4 changes: 0 additions & 4 deletions src/Files.App/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,8 @@
<ResourceDictionary Source="ms-appx:///Styles/DefaultGridSplitterStyle.xaml" />
</ResourceDictionary.MergedDictionaries>

<x:Boolean x:Key="True">True</x:Boolean>
<x:Boolean x:Key="False">False</x:Boolean>

<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />


<MenuFlyout x:Key="SidebarContextMenu">
<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowPinnedFoldersSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=Pinned}" />
<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowLibrarySection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarLibraries}" />
Expand Down