refactor: use axaml

MahApps · Nov 5, 2024 · b936bc9 · b936bc9
1 parent 410dddb
commit b936bc9
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 16 deletions.
diff --git a/...IconPacks.Avalonia.BoxIcons/BoxIcons.xaml → ...conPacks.Avalonia.BoxIcons/BoxIcons.axaml b/...IconPacks.Avalonia.BoxIcons/BoxIcons.xaml → ...conPacks.Avalonia.BoxIcons/BoxIcons.axaml
@@ -3,10 +3,10 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="avares://IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.xaml" />
+                <MergeResourceInclude Source="avares://IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
-    <StyleInclude Source="avares://IconPacks.Avalonia.Core/PackIcon.xaml" />
+    <StyleInclude Source="avares://IconPacks.Avalonia.Core/PackIcon.axaml" />
 </Styles>
diff --git a/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj b/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj
@@ -17,7 +17,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <AvaloniaResource Include="**/*.xaml" />
         <AvaloniaResource Include="Resources/**" />
     </ItemGroup>
 

diff --git a/...s.Avalonia.BoxIcons/PackIconBoxIcons.xaml → ....Avalonia.BoxIcons/PackIconBoxIcons.axaml b/...s.Avalonia.BoxIcons/PackIconBoxIcons.xaml → ....Avalonia.BoxIcons/PackIconBoxIcons.axaml
diff --git a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
@@ -22,8 +22,4 @@
         <PackageReference Include="System.Text.Json" />
     </ItemGroup>
 
-    <ItemGroup>
-        <AvaloniaResource Include="**/*.xaml" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/IconPacks.Avalonia.Core/PackIcon.xaml → src/IconPacks.Avalonia.Core/PackIcon.axaml b/src/IconPacks.Avalonia.Core/PackIcon.xaml → src/IconPacks.Avalonia.Core/PackIcon.axaml
@@ -3,7 +3,7 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="avares://IconPacks.Avalonia.Core/PackIconControlBase.xaml" />
+                <MergeResourceInclude Source="avares://IconPacks.Avalonia.Core/PackIconControlBase.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>

diff --git a/...ks.Avalonia.Core/PackIconControlBase.xaml → ...s.Avalonia.Core/PackIconControlBase.axaml b/...ks.Avalonia.Core/PackIconControlBase.xaml → ...s.Avalonia.Core/PackIconControlBase.axaml
diff --git a/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj b/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj
@@ -16,8 +16,4 @@
         <ProjectReference Include="..\IconPacks.Avalonia.BoxIcons\IconPacks.Avalonia.BoxIcons.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <AvaloniaResource Include="**/*.xaml" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/IconPacks.Avalonia/Icons.xaml → src/IconPacks.Avalonia/Icons.axaml b/src/IconPacks.Avalonia/Icons.xaml → src/IconPacks.Avalonia/Icons.axaml
@@ -3,11 +3,11 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="avares://IconPacks.Avalonia/PackIconControl.xaml" />
+                <MergeResourceInclude Source="avares://IconPacks.Avalonia/PackIconControl.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
-    <StyleInclude Source="avares://IconPacks.Avalonia.Core/PackIcon.xaml" />
-    <StyleInclude Source="avares://IconPacks.Avalonia.BoxIcons/BoxIcons.xaml" />
+    <StyleInclude Source="avares://IconPacks.Avalonia.Core/PackIcon.axaml" />
+    <StyleInclude Source="avares://IconPacks.Avalonia.BoxIcons/BoxIcons.axaml" />
 </Styles>
diff --git a/src/IconPacks.Avalonia/PackIconControl.xaml → src/IconPacks.Avalonia/PackIconControl.axaml b/src/IconPacks.Avalonia/PackIconControl.xaml → src/IconPacks.Avalonia/PackIconControl.axaml