use Devolutions.AvaloniaTheme namespace to avoid conflicts

Author: Marc-André Moreau

.github/workflows/build-package.yml

@@ -115,7 +115,7 @@ jobs:
         run: |
           $PackageVersion = '${{ needs.preflight.outputs.package-version }}'
           $PackageList = '${{ needs.preflight.outputs.package-list }}'
-          $ProjectDirs = @($PackageList -Split ',' | ForEach-Object { ".\src\Devolutions.Avalonia.Theme.$_" })
+          $ProjectDirs = @($PackageList -Split ',' | ForEach-Object { ".\src\Devolutions.AvaloniaTheme.$_" })
           foreach ($ProjectDir in $ProjectDirs) {
             $csprojPath = (Get-Item "$ProjectDir\*.csproj" | Select-Object -First 1).FullName
             $csprojContent = Get-Content $csprojPath -Raw
@@ -127,7 +127,7 @@ jobs:
         shell: pwsh
         run: |
           $PackageList = '${{ needs.preflight.outputs.package-list }}'
-          $ProjectDirs = @($PackageList -Split ',' | ForEach-Object { ".\src\Devolutions.Avalonia.Theme.$_" })
+          $ProjectDirs = @($PackageList -Split ',' | ForEach-Object { ".\src\Devolutions.AvaloniaTheme.$_" })
           foreach ($ProjectDir in $ProjectDirs) {
             & dotnet pack $ProjectDir -o package
           }

README.md

@@ -2,13 +2,13 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{8FB0A38F-D80A-45A1-9796-FD22FDB14064}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Devolutions.Avalonia.Theme.MacOS", "src\Devolutions.Avalonia.Theme.MacOS\Devolutions.Avalonia.Theme.MacOS.csproj", "{052424E1-48F3-4D8E-A780-DEB4D33B4482}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Devolutions.AvaloniaTheme.MacOS", "src\Devolutions.AvaloniaTheme.MacOS\Devolutions.AvaloniaTheme.MacOS.csproj", "{052424E1-48F3-4D8E-A780-DEB4D33B4482}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7756B42B-13EB-4DC9-BA61-11997466D93C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8D46D8D5-74CA-4EC1-ACA9-1AF9E5A92550}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Devolutions.Avalonia.Theme.DevExpress", "src\Devolutions.Avalonia.Theme.DevExpress\Devolutions.Avalonia.Theme.DevExpress.csproj", "{DDDC64A4-451A-4496-841C-30C3C4BA62AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Devolutions.AvaloniaTheme.DevExpress", "src\Devolutions.AvaloniaTheme.DevExpress\Devolutions.AvaloniaTheme.DevExpress.csproj", "{DDDC64A4-451A-4496-841C-30C3C4BA62AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

avalonia-themes.sln

@@ -4,8 +4,8 @@
 
   <Application.Styles>
     <!-- <FluentTheme /> -->
-    <StyleInclude Source="avares://Devolutions.Avalonia.Theme.MacOS/MacOSTheme.axaml" />
-    <!-- <StyleInclude Source="avares://Devolutions.Avalonia.Theme.DevExpress/DevExpressTheme.axaml" /> -->
+    <StyleInclude Source="avares://Devolutions.AvaloniaTheme.MacOS/MacOSTheme.axaml" />
+    <!-- <StyleInclude Source="avares://Devolutions.AvaloniaTheme.DevExpress/DevExpressTheme.axaml" /> -->
     <StyleInclude Source="/Styles.axaml" />
   </Application.Styles>
 </Application>

samples/SampleApp/App.axaml

@@ -20,7 +20,7 @@
     <ItemGroup>
         <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2"/>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-        <!-- <PackageReference Include="Devolutions.Avalonia.Theme.MacOS" Version="2024.12.4" /> -->
+        <!-- <PackageReference Include="Devolutions.AvaloniaTheme.MacOS" Version="2024.12.4" /> -->
     </ItemGroup>
 
     <ItemGroup>
@@ -31,7 +31,7 @@
     <!-- Temporary link for development. 
          (To use the published nuget, uncomment PackageReference above (update version) or install with Nuget manager) -->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Devolutions.Avalonia.Theme.MacOS\Devolutions.Avalonia.Theme.MacOS.csproj"/>
-        <ProjectReference Include="..\..\src\Devolutions.Avalonia.Theme.DevExpress\Devolutions.Avalonia.Theme.DevExpress.csproj"/>
+        <ProjectReference Include="..\..\src\Devolutions.AvaloniaTheme.MacOS\Devolutions.AvaloniaTheme.MacOS.csproj"/>
+        <ProjectReference Include="..\..\src\Devolutions.AvaloniaTheme.DevExpress\Devolutions.AvaloniaTheme.DevExpress.csproj"/>
     </ItemGroup>
 </Project>

samples/SampleApp/SampleApp.csproj

@@ -2,7 +2,7 @@
 using Avalonia;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.DevExpress.Converters;
+namespace Devolutions.AvaloniaTheme.DevExpress.Converters;
 
 public class BooleanToChoiceConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Accents/Styles.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Accents/Styles.axaml

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.DevExpress.Converters;
+namespace Devolutions.AvaloniaTheme.DevExpress.Converters;
 
 public class CharToDevExpressPasswordCharConverter : IValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Accents/ThemeResources.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Accents/ThemeResources.axaml

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.DevExpress.Converters;
+namespace Devolutions.AvaloniaTheme.DevExpress.Converters;
 
 public class RevealPasswordToFontSizeConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Controls/Button.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/Button.axaml

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.DevExpress.Converters;
+namespace Devolutions.AvaloniaTheme.DevExpress.Converters;
 
 /// <summary>
 ///   Takes a TabItem, its parent TabControl and the name of a Border element and returns a boolean to indicate if the

src/Devolutions.Avalonia.Theme.DevExpress/Controls/ComboBox.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/ComboBox.axaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Devolutions.Avalonia.Theme.DevExpress.Converters">
+                    xmlns:converters="clr-namespace:Devolutions.AvaloniaTheme.DevExpress.Converters">
 
   <converters:BooleanToChoiceConverter x:Key="BooleanToChoiceConverter" />
   <converters:CharToDevExpressPasswordCharConverter x:Key="CharToDevExpressPasswordCharConverter" />

src/Devolutions.Avalonia.Theme.DevExpress/Controls/ComboBoxItem.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/ComboBoxItem.axaml

@@ -68,7 +68,7 @@
 
       <!-- DestinationRect Height must match TreeViewItem Height * 2 -->
       <ImageBrush x:Key="StripedBackgroundBrush"
-                  Source="avares://Devolutions.Avalonia.Theme.MacOS/Accents/Assets/Alternating_Row_Background_Light.png"
+                  Source="avares://Devolutions.AvaloniaTheme.MacOS/Accents/Assets/Alternating_Row_Background_Light.png"
                   TileMode="Tile"
                   Stretch="None"
                   DestinationRect="0 0 40 44" />
@@ -170,7 +170,7 @@
 
       <!-- DestinationRect Height must match TreeViewItem Height * 2 -->
       <ImageBrush x:Key="StripedBackgroundBrush"
-                  Source="avares://Devolutions.Avalonia.Theme.MacOS/Accents/Assets/Alternating_Row_Background_Dark.png"
+                  Source="avares://Devolutions.AvaloniaTheme.MacOS/Accents/Assets/Alternating_Row_Background_Dark.png"
                   TileMode="Tile"
                   Stretch="None"
                   DestinationRect="0 0 40 44" />

src/Devolutions.Avalonia.Theme.DevExpress/Controls/TabControl.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/TabControl.axaml

@@ -2,7 +2,7 @@
 using Avalonia;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class BooleanToChoiceConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Controls/TabItem.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/TabItem.axaml

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class CharToMacOsPasswordCharConverter : IValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Controls/TextBox.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/TextBox.axaml

@@ -3,7 +3,7 @@
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class ClassToChoiceConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Controls/Window.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/Window.axaml

@@ -2,7 +2,7 @@
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 /// <summary>
 ///   Converts a Brush and CSS class(es) into a CSS string for SVG styling.

src/Devolutions.Avalonia.Theme.DevExpress/Controls/_index.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Controls/_index.axaml

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 /// <summary>
 ///   Takes a _single_ input and returns a boolean based on whether the input is a boolean and true.

src/Devolutions.Avalonia.Theme.DevExpress/Converters/BooleanToChoiceConverter.cs renamed to src/Devolutions.AvaloniaTheme.DevExpress/Converters/BooleanToChoiceConverter.cs

@@ -2,7 +2,7 @@
 using Avalonia;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 /// <summary>
 ///   Takes a _single_ input and returns a boolean if it is unset.

src/Devolutions.Avalonia.Theme.DevExpress/Converters/CharToDevExpressPasswordCharConverter.cs renamed to src/Devolutions.AvaloniaTheme.DevExpress/Converters/CharToDevExpressPasswordCharConverter.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class RevealPasswordToFontSizeConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Converters/RevealPasswordToFontSizeConverter.cs renamed to src/Devolutions.AvaloniaTheme.DevExpress/Converters/RevealPasswordToFontSizeConverter.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class SelectedIndexToPopupOffsetConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Converters/TabBorderVisibilityConverter.cs renamed to src/Devolutions.AvaloniaTheme.DevExpress/Converters/TabBorderVisibilityConverter.cs

@@ -2,7 +2,7 @@
 using Avalonia;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class ThicknessToSelectiveThicknessConverter : IValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/Converters/_index.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/Converters/_index.axaml

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.Avalonia.Theme.MacOS.Converters;
+namespace Devolutions.AvaloniaTheme.MacOS.Converters;
 
 public class TotalWidthConverter : IMultiValueConverter
 {

src/Devolutions.Avalonia.Theme.DevExpress/DevExpressTheme.axaml renamed to src/Devolutions.AvaloniaTheme.DevExpress/DevExpressTheme.axaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Devolutions.Avalonia.Theme.MacOS.Converters">
+                    xmlns:converters="clr-namespace:Devolutions.AvaloniaTheme.MacOS.Converters">
 
   <converters:SelectedIndexToPopupOffsetConverter x:Key="SelectedIndexToPopupOffsetConverter" />
   <converters:TotalWidthConverter x:Key="TotalWidthConverter" />