refactor: use XAMLStyler in ci build

MahApps · Jun 6, 2024 · c4ae614 · c4ae614
1 parent 94066f5
commit c4ae614
Show file tree

Hide file tree

Showing 26 changed files with 217 additions and 11,525 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "xamlstyler.console": {
+      "version": "3.2404.2",
+      "commands": [
+        "xstyler"
+      ]
+    }
+  }
+}
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -103,7 +103,8 @@
               "CreateRelease",
               "Publish",
               "Restore",
-              "SignArtifacts"
+              "SignArtifacts",
+              "XamlStyler"
             ]
           }
         },
@@ -123,7 +124,8 @@
               "CreateRelease",
               "Publish",
               "Restore",
-              "SignArtifacts"
+              "SignArtifacts",
+              "XamlStyler"
             ]
           }
         },

diff --git a/XamlStyler/Options/XAMLStyler.json → Settings.XAMLStyler b/XamlStyler/Options/XAMLStyler.json → Settings.XAMLStyler
@@ -2,9 +2,9 @@
     "IndentSize": 4,
     "AttributesTolerance": 2,
     "KeepFirstAttributeOnSameLine": true,
-    "MaxAttributeCharatersPerLine": 0,
+    "MaxAttributeCharactersPerLine": 0,
     "MaxAttributesPerLine": 1,
-    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush",
+    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush, Pen",
     "SeparateByGroups": false,
     "AttributeIndentation": 0,
     "AttributeIndentationStyle": 1,
@@ -14,12 +14,14 @@
         "x:Class",
         "xmlns, xmlns:x",
         "xmlns:*",
-        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title, Header",
+        "TargetType, BasedOn, Style",
         "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
         "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
         "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+        "Background, Foreground, FontFamily, FontSize, LineHeight, FontWeight, FontStyle, FontStretch",
         "*:*, *",
-        "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+        "PageSource, PageIndex, Color, Opacity, Offset, TargetName, Property, Value, StartPoint, EndPoint",
         "*:Freeze, mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
         "Storyboard.*, From, To, Duration"
     ],
@@ -34,7 +36,7 @@
     "ReorderCanvasChildren": false,
     "ReorderSetters": 3,
     "FormatMarkupExtension": true,
-    "NoNewLineMarkupExtensions": "x:Bind, Binding, TemplateBinding, x:Static, DynamicResource, ComponentResourceKey, iconPacks:Modern, iconPacks:Material",
+    "NoNewLineMarkupExtensions": "x:Bind, Binding, TemplateBinding, x:Static, DynamicResource, ComponentResourceKey, RelativeSource",
     "ThicknessSeparator": 1,
     "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
     "FormatOnSave": false,

diff --git a/XamlStyler/CommandLine.dll b/XamlStyler/CommandLine.dll
diff --git a/XamlStyler/CommandLine.xml b/XamlStyler/CommandLine.xml
diff --git a/XamlStyler/Irony.dll b/XamlStyler/Irony.dll
diff --git a/XamlStyler/Irony.xml b/XamlStyler/Irony.xml
diff --git a/XamlStyler/Newtonsoft.Json.dll b/XamlStyler/Newtonsoft.Json.dll
diff --git a/XamlStyler/Newtonsoft.Json.xml b/XamlStyler/Newtonsoft.Json.xml
diff --git a/XamlStyler/Options/DefaultSettings.json b/XamlStyler/Options/DefaultSettings.json
diff --git a/XamlStyler/Settings.XamlStyler b/XamlStyler/Settings.XamlStyler
diff --git a/XamlStyler/XamlStyler.Core.dll b/XamlStyler/XamlStyler.Core.dll
diff --git a/XamlStyler/format_all_xaml.cmd b/XamlStyler/format_all_xaml.cmd
diff --git a/XamlStyler/xstyler.exe b/XamlStyler/xstyler.exe
diff --git a/XamlStyler/xstyler.exe.config b/XamlStyler/xstyler.exe.config
diff --git a/build/Build.cs b/build/Build.cs
@@ -76,15 +76,11 @@ protected override void OnBuildInitialized()
         Log.Information("NuGet           Version: {NuGetVersion}", GitVersion.NuGetVersion);
     }
 
-    [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
-    readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
+    [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
-    [Solution(GenerateProjects = true, SuppressBuildProjectCheck = false)]
-    readonly Solution Solution;
-    [GitRepository]
-    readonly GitRepository GitRepository;
-    [GitVersion(Framework = "net6.0", NoFetch = true)]
-    readonly GitVersion GitVersion;
+    [Solution(GenerateProjects = true, SuppressBuildProjectCheck = false)] readonly Solution Solution;
+    [GitRepository] readonly GitRepository GitRepository;
+    [GitVersion(Framework = "net6.0", NoFetch = true)] readonly GitVersion GitVersion;
 
     AbsolutePath SourceDirectory => RootDirectory / "src";
     AbsolutePath OutputDirectory => RootDirectory / "artifacts";
@@ -105,15 +101,24 @@ protected override void OnBuildInitialized()
         });
 
     Target Restore => _ => _
+        .DependsOn(Clean)
         .Executes(() =>
         {
+            DotNetToolRestore();
+
             DotNetRestore(s => s
                 .SetProjectFile(Solution));
         });
 
-    Target Compile => _ => _
+    Target XamlStyler => _ => _
         .DependsOn(Restore)
-        .DependsOn(Clean)
+        .Executes(() =>
+        {
+            DotNet($"xstyler --recursive --directory \"{SourceDirectory}\" --config \"{RootDirectory / "Settings.XAMLStyler"}\"");
+        });
+
+    Target Compile => _ => _
+        .DependsOn(XamlStyler)
         .Executes(() =>
         {
             DotNetBuild(s => s
@@ -223,12 +228,12 @@ private void UploadReleaseAssetToGithub(IGitHubClient client, Release release, A
         Log.Information("Done Uploading {FileName} to the release", asset.Name);
     }
 
-    [Parameter("GitHub Api key")][Secret] string GithubToken = null;
-    [Parameter][Secret] readonly string AzureKeyVaultUrl;
-    [Parameter][Secret] readonly string AzureKeyVaultClientId;
-    [Parameter][Secret] readonly string AzureKeyVaultTenantId;
-    [Parameter][Secret] readonly string AzureKeyVaultClientSecret;
-    [Parameter][Secret] readonly string AzureKeyVaultCertificate;
+    [Parameter("GitHub Api key")] [Secret] string GithubToken = null;
+    [Parameter] [Secret] readonly string AzureKeyVaultUrl;
+    [Parameter] [Secret] readonly string AzureKeyVaultClientId;
+    [Parameter] [Secret] readonly string AzureKeyVaultTenantId;
+    [Parameter] [Secret] readonly string AzureKeyVaultClientSecret;
+    [Parameter] [Secret] readonly string AzureKeyVaultCertificate;
 
     void SignFiles(IEnumerable<string> files, string description, string descriptionUrl)
     {

diff --git a/src/IconPacks.Browser/App.xaml b/src/IconPacks.Browser/App.xaml
@@ -21,28 +21,28 @@
             </ResourceDictionary.MergedDictionaries>
 
             <!--  Brushes  -->
-            <SolidColorBrush x:Key="IconPackBrowser.Brushes.PanelBackground" Opacity="0.15" Color="#808080" />
+            <SolidColorBrush x:Key="IconPackBrowser.Brushes.PanelBackground" Color="#808080" Opacity="0.15" />
 
             <!--  Styles  -->
             <Style x:Key="UnderlinedTextBlockStyle"
-                   BasedOn="{StaticResource {x:Type TextBlock}}"
-                   TargetType="{x:Type TextBlock}">
+                   TargetType="{x:Type TextBlock}"
+                   BasedOn="{StaticResource {x:Type TextBlock}}">
                 <Style.Triggers>
                     <Trigger Property="IsMouseOver" Value="True">
                         <Setter Property="TextDecorations" Value="Underline" />
                     </Trigger>
                 </Style.Triggers>
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem}" TargetType="{x:Type ListBoxItem}">
+            <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                 <Setter Property="Padding" Value="0" />
                 <Setter Property="VerticalContentAlignment" Value="Center" />
             </Style>
 
             <Style x:Key="CustomMetroCircleButtonStyle"
-                   BasedOn="{StaticResource MahApps.Styles.Button.Circle}"
-                   TargetType="{x:Type Button}">
+                   TargetType="{x:Type Button}"
+                   BasedOn="{StaticResource MahApps.Styles.Button.Circle}">
                 <Setter Property="Background" Value="Transparent" />
                 <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                 <Setter Property="BorderThickness" Value="2" />
@@ -57,8 +57,8 @@
                                 <Ellipse Fill="{TemplateBinding Background}" StrokeThickness="0" />
                                 <Ellipse x:Name="ellipsebg"
                                          Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"
-                                         Opacity="0"
-                                         StrokeThickness="0" />
+                                         StrokeThickness="0"
+                                         Opacity="0" />
                                 <Ellipse x:Name="ellipse"
                                          Stroke="{TemplateBinding BorderBrush}"
                                          StrokeThickness="{Binding RelativeSource={x:Static RelativeSource.TemplatedParent}, Path=BorderThickness.Left}" />
@@ -92,21 +92,21 @@
                 <Setter Property="VerticalContentAlignment" Value="Center" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.Expander}" TargetType="Expander">
+            <Style TargetType="Expander" BasedOn="{StaticResource MahApps.Styles.Expander}">
                 <Setter Property="IsExpanded" Value="True" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="mah:MetroHeader">
+            <Style TargetType="mah:MetroHeader" BasedOn="{StaticResource MahApps.Styles.MetroHeader}">
                 <Setter Property="Padding" Value="2 0 2 4" />
-                <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="2 2 2 4" />
                 <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
+                <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="2 2 2 4" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.ColorPicker}" TargetType="mah:ColorPicker">
+            <Style TargetType="mah:ColorPicker" BasedOn="{StaticResource MahApps.Styles.ColorPicker}">
                 <Setter Property="BorderThickness" Value="0" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.ComboBox}" TargetType="ComboBox">
+            <Style TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox}">
                 <Setter Property="BorderThickness" Value="0" />
             </Style>
 

diff --git a/src/IconPacks.Browser/Controls/CopyToClipboardTextBox.xaml b/src/IconPacks.Browser/Controls/CopyToClipboardTextBox.xaml
@@ -16,9 +16,9 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
         <TextBox MaxHeight="60"
+                 FontFamily="{Binding ElementName=ucCopyToClipboardTextBox, Path=FontFamily}"
                  mah:TextBoxHelper.SelectAllOnFocus="True"
                  BorderThickness="0"
-                 FontFamily="{Binding ElementName=ucCopyToClipboardTextBox, Path=FontFamily}"
                  IsReadOnly="True"
                  Text="{Binding ElementName=ucCopyToClipboardTextBox, Path=TextToCopy, Mode=OneWay}"
                  TextWrapping="Wrap"
@@ -30,7 +30,7 @@
                 Content="{iconPacks:Octicons Kind=Copy}"
                 ToolTip="Copy">
             <Button.Style>
-                <Style BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}" TargetType="{x:Type Button}">
+                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}">
                     <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
                     <Style.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">

diff --git a/src/IconPacks.Browser/Controls/SettingsView.xaml b/src/IconPacks.Browser/Controls/SettingsView.xaml
@@ -60,7 +60,7 @@
                                          SelectedColorTemplate="{StaticResource IconPacksBroser.Templates.ColorPicker.Accent}"
                                          StandardColorPaletteItemsSource="{x:Static vm:SettingsViewModel.AccentColors}">
                             <mah:ColorPicker.StandardColorPaletteStyle>
-                                <Style BasedOn="{StaticResource MahApps.Styles.ColorPalette.ColorPickerDropDown}" TargetType="{x:Type mah:ColorPalette}">
+                                <Style TargetType="{x:Type mah:ColorPalette}" BasedOn="{StaticResource MahApps.Styles.ColorPalette.ColorPickerDropDown}">
                                     <Setter Property="ItemContainerStyle" Value="{DynamicResource MahApps.Styles.ListBoxItem}" />
                                     <Setter Property="ItemTemplate" Value="{DynamicResource IconPacksBroser.Templates.ColorPicker.Accent}" />
                                     <Setter Property="ItemsPanel">
@@ -87,21 +87,21 @@
                 <StackPanel>
                     <mah:MetroHeader Header="Directory for custom export templates">
                         <StackPanel>
-                            <TextBox mah:TextBoxHelper.Watermark="Build-In Templates"
-                                     Style="{StaticResource IconPacksBrowser.Styles.TextBox.Hyperlink}"
+                            <TextBox Style="{StaticResource IconPacksBrowser.Styles.TextBox.Hyperlink}"
+                                     mah:TextBoxHelper.Watermark="Build-In Templates"
                                      Text="{Binding Source={x:Static prop:Settings.Default}, Path=ExportTemplatesDir}" />
-                            <Button Margin="0 5 0 0"
+                            <Button Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
+                                    Margin="0 5 0 0"
                                     Command="{Binding SelectTemplateFolderCommand}"
-                                    Content="Select a custom template folder"
-                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}" />
-                            <Button Margin="0 5 0 0"
+                                    Content="Select a custom template folder" />
+                            <Button Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
+                                    Margin="0 5 0 0"
                                     Command="{Binding ClearTemplatesDirCommand}"
-                                    Content="Reset template folder to default"
-                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}" />
-                            <Button Margin="0 5 0 0"
+                                    Content="Reset template folder to default" />
+                            <Button Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
+                                    Margin="0 5 0 0"
                                     Command="{Binding CopyOriginalTemplatesCommand}"
-                                    Content="Copy original templates to custom folder"
-                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}" />
+                                    Content="Copy original templates to custom folder" />
                         </StackPanel>
                     </mah:MetroHeader>
                 </StackPanel>